Merge pull request #26 from FultonBrowne/test

fixed minor issue
FultonBrowne · Oct 8, 2019 · b83c0d4 · b83c0d4
2 parents d553036 + e8f7589
commit b83c0d4
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 170 deletions.
diff --git a/bin/main/META-INF/MANIFEST.MF b/bin/main/META-INF/MANIFEST.MF
diff --git a/bin/main/com/andromeda/araserver/GetInfo.class b/bin/main/com/andromeda/araserver/GetInfo.class
diff --git a/bin/main/com/andromeda/araserver/GetUrl.kt b/bin/main/com/andromeda/araserver/GetUrl.kt
diff --git a/bin/main/com/andromeda/araserver/Hello.class b/bin/main/com/andromeda/araserver/Hello.class
diff --git a/bin/main/com/andromeda/araserver/OutputModel.class b/bin/main/com/andromeda/araserver/OutputModel.class
diff --git a/bin/main/com/andromeda/araserver/RssMain.kt b/bin/main/com/andromeda/araserver/RssMain.kt
diff --git a/bin/main/com/andromeda/araserver/Run.class b/bin/main/com/andromeda/araserver/Run.class
diff --git a/bin/main/com/andromeda/araserver/SqlModel.class b/bin/main/com/andromeda/araserver/SqlModel.class
diff --git a/bin/main/com/andromeda/araserver/Update.kt b/bin/main/com/andromeda/araserver/Update.kt
diff --git a/bin/main/com/andromeda/araserver/apiStart.class b/bin/main/com/andromeda/araserver/apiStart.class
diff --git a/bin/main/com/andromeda/araserver/equations.class b/bin/main/com/andromeda/araserver/equations.class
diff --git a/bin/main/com/andromeda/araserver/locdec.class b/bin/main/com/andromeda/araserver/locdec.class
diff --git a/bin/main/com/andromeda/araserver/sort.class b/bin/main/com/andromeda/araserver/sort.class
diff --git a/bin/main/html/dashboard.html b/bin/main/html/dashboard.html
diff --git a/src/main/java/com/andromeda/araserver/pages/RssMain.kt b/src/main/java/com/andromeda/araserver/pages/RssMain.kt
@@ -1,4 +1,4 @@
-package com.andromeda.araserver.pages
+package com.andromeda.araserver
 
 import com.andromeda.araserver.util.Sort
 import com.rometools.rome.feed.synd.SyndEntry
@@ -33,26 +33,36 @@ object RssMain {
                 //World news
                 feeds[0] = "https://www.cbsnews.com/latest/rss/world"
                 feeds[1] = "http://feeds.foxnews.com/foxnews/world"
+                feeds[2] = "http://feeds.bbci.co.uk/news/world/rss.xml"
+                feeds[3] = "http://feeds.reuters.com/Reuters/worldNews"
             }
             2 -> {
                 // Us news
                 feeds[0] = "https://www.cbsnews.com/latest/rss/us"
                 feeds[1] = "http://feeds.foxnews.com/foxnews/national"
+                feeds[2] = "http://feeds.reuters.com/Reuters/domesticNews"
+                feeds[3] = "http://news.yahoo.com/rss/"
             }
             3 -> {
                 //Tech news
                 feeds[0] = "https://www.cnet.com/rss/news/"
                 feeds[1] = "http://www.foxnews.com/about/rss"
+                feeds[2] = "http://feeds.bbci.co.uk/news/technology/rss.xml"
+                feeds[3] = "https://hnrss.org/newest"
             }
             4 -> {
                 //Business news
                 feeds[0] = "http://feeds.reuters.com/reuters/businessNews"
                 feeds[1] = "https://www.espn.com/espn/rss/news/rss.xml"
+                feeds[2] = "http://feeds.bbci.co.uk/news/business/rss.xml"
+                feeds[3] = "http://feeds.reuters.com/reuters/businessNews"
             }
             else -> {
                 // general news
                 feeds[0] = "https://www.cbsnews.com/latest/rss/main/"
                 feeds[1] = "http://feeds.foxnews.com/foxnews/latest"
+                feeds[2] = "https://www.espn.com/espn/rss/news"
+                feeds[3] = "http://feeds.reuters.com/Reuters/worldNews"
             }
         }
         //Declare Feed