Trying to fix wierd bugs

FultonBrowne · Sep 19, 2019 · 25dc691 · 25dc691
1 parent 4ed321d
commit 25dc691
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/src/main/java/com/andromeda/araserver/OutputModel.java b/src/main/java/com/andromeda/araserver/OutputModel.java
@@ -2,11 +2,11 @@
 
 @SuppressWarnings({"FieldCanBeLocal", "unused"})
 class OutputModel {
-    private String title;
-    private String link;
-    private String description;
-    private String OutputTxt;
-    private String exes;
+     String title;
+     String link;
+     String description;
+     String OutputTxt;
+     String exes;
 
     OutputModel(String title, String description, String link, String image, String OutputTxt, String exes) {
         this.title = title;

diff --git a/src/main/java/com/andromeda/araserver/apiStart.java b/src/main/java/com/andromeda/araserver/apiStart.java
@@ -14,16 +14,16 @@
 class apiStart {
     private String result;
     private GsonBuilder gsonBuilder = new GsonBuilder();
-     private ArrayList<RssFeedModel> test = new ArrayList<>();
+     private ArrayList<OutputModel> test = new ArrayList<>();
      private ArrayList<SqlModel> sqlmodel = new ArrayList<>();
      private String linkval;
 
 
     String apiMain(String mainUri){
         String searchterm = mainUri.replaceFirst("/api/", "");
         Gson output = gsonBuilder.create();
-        test.add(new RssFeedModel("hi","hi","hi","hi"));
-        test.add(new RssFeedModel("hi","hi","hi","hi"));
+        test.add(new OutputModel("Blank Input Received", "Please Try Again", "https://github.com/fultonbrowne/ara-android","","Error Was Encountered", ""));
+
 
 
 
@@ -59,22 +59,30 @@ private String sqltest(String search){
             System.exit(0);
         }
         System.out.println("Opened database successfully");
-        for (int i = 0; i < sqlmodel.size() ; i++) {
-            if (search.startsWith(sqlmodel.get(i).title)){
-                linkval = sqlmodel.get(i).link;
-            }
-            else if (search.startsWith(sqlmodel.get(i).description)){
-                linkval = sqlmodel.get(i).link;
+        System.out.println(search);
+        System.out.println(search.startsWith(sqlmodel.get(0).title));
+        if(!search.equals("")){
+
+            for (SqlModel sqlModel : sqlmodel) {
+                if (search.startsWith(sqlModel.title)) {
+                    linkval = sqlModel.link;
+                    System.out.println("BT");
+                } else if (search.endsWith(sqlModel.description)) {
+
+                    linkval = sqlModel.link;
+                }
+                System.out.println("AT");
+
 
             }
         }
 
         if (linkval == null){
             linkval = "error";
         }
-        System.out.println(linkval + "/" + search);
+        //System.out.println(linkval + "/" + search);
         String url = linkval;
-        if (!linkval.endsWith("/")) url = url +"/";
+        //if (!linkval.endsWith("/")) url = url +"/";
 
         URL obj = null;
         try {
@@ -115,6 +123,7 @@ else if (search.startsWith(sqlmodel.get(i).description)){
         System.out.println(out);
         } catch (Exception e) {
             e.printStackTrace();
+            out = new Gson().toJson(test);
             result = "err";
         }
         return out;