bugfixes for

- next-execution-time in scheduler
- deletion of scheduled rss feed loading (now deletes also the scheduling entry)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7075 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/Load_RSS_p.java

@@ -63,7 +63,7 @@ public class Load_RSS_p {
         prop.put("showscheduledfeeds", 0);
         prop.put("url", "");
 
-        if (post != null && (post.containsKey("removeSelectedFeedNewList") || post.containsKey("removeSelectedFeedScheduler"))) {
+        if (post != null && post.containsKey("removeSelectedFeedNewList")) {
             for (Map.Entry<String, String> entry: post.entrySet()) {
                 if (entry.getValue().startsWith("mark_")) try {
                     sb.tables.delete("rss", entry.getValue().substring(5).getBytes());
@@ -73,21 +73,55 @@ public class Load_RSS_p {
             }
         }
         
-        if (post != null && post.containsKey("addSelectedFeedScheduler")) {
+        if (post != null && post.containsKey("removeSelectedFeedScheduler")) {
             for (Map.Entry<String, String> entry: post.entrySet()) {
                 if (entry.getValue().startsWith("mark_")) try {
-                    Row row = sb.tables.select("rss", entry.getValue().substring(5).getBytes());
+                    byte[] pk = entry.getValue().substring(5).getBytes();
+                    Row rssRow = sb.tables.select("rss", pk);
+                    byte[] schedulerPK = rssRow.get("api_pk", (byte[]) null);
+                    if (schedulerPK != null) sb.tables.delete("api", schedulerPK);
+                    rssRow.remove("api_pk");
+                    sb.tables.insert("rss", pk, rssRow);
+                } catch (IOException e) {
+                    Log.logException(e);
+                } catch (RowSpaceExceededException e) {
+                    Log.logException(e);
+                }
+            }
+        }
+        
+        if (post != null && post.containsKey("addSelectedFeedScheduler")) {
+            for (Map.Entry<String, String> entry: post.entrySet()) {
+                if (entry.getValue().startsWith("mark_")) {
+                    Row row;
                     RSSReader rss = null;
-                    DigestURI url = new DigestURI(row.get("url", ""));
+                    try {
+                        byte [] pk = entry.getValue().substring(5).getBytes();
+                        row = sb.tables.select("rss", pk);
+                    } catch (IOException e) {
+                        Log.logException(e);
+                        continue;
+                    } catch (RowSpaceExceededException e) {
+                        Log.logException(e);
+                        continue;
+                    }
+                    DigestURI url = null;
+                    try {
+                        url = new DigestURI(row.get("url", ""));
+                    } catch (MalformedURLException e) {
+                        Log.logWarning("Load_RSS", "malformed url '" + row.get("url", "") + "': " + e.getMessage());
+                        continue;
+                    }
                     try {
                         Response response = sb.loader.load(sb.loader.request(url, true, false), CrawlProfile.CacheStrategy.NOCACHE, Long.MAX_VALUE);
                         byte[] resource = response == null ? null : response.getContent();
                         rss = resource == null ? null : RSSReader.parse(RSSFeed.DEFAULT_MAXSIZE, resource);
                     } catch (IOException e) {
-                        Log.logException(e);
+                        Log.logWarning("Load_RSS", "rss loading for url '" + url.toNormalform(true, false) + "' failed: " + e.getMessage());
+                        continue;
                     }
                     if (rss == null) {
-                        Log.logWarning("Load_RSS", "no rss for url" + url.toNormalform(true, false));
+                        Log.logWarning("Load_RSS", "no rss for url " + url.toNormalform(true, false));
                     } else {
                         RSSFeed feed = rss.getFeed();
                         indexAllRssFeed(sb, url, feed);
@@ -95,10 +129,6 @@ public class Load_RSS_p {
                         // add the feed also to the scheduler
                         recordAPI(sb, url, rss.getFeed(), 1, "seldays");
                     }
-                } catch (IOException e) {
-                    Log.logException(e);
-                } catch (RowSpaceExceededException e) {
-                    Log.logException(e);
                 }
             }
         }
@@ -124,7 +154,7 @@ public class Load_RSS_p {
                     Row r = api_pk == null ? null : sb.tables.select("api", api_pk);
                     if (r != null && r.get("comment", "").matches(".*\\Q" + messageurl + "\\E.*")) {
                         // this is a recorded entry
-                        Date date_next_exec = r.containsKey(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC) ? row.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, new Date()) : null;
+                        Date date_next_exec = r.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, (Date) null);
                         prop.put("showscheduledfeeds_list_" + apic + "_pk", new String(row.getPK()));
                         prop.put("showscheduledfeeds_list_" + apic + "_count", apic);
                         prop.put("showscheduledfeeds_list_" + apic + "_rss", messageurl);

htroot/Table_API_p.java

@@ -174,7 +174,7 @@ public class Table_API_p {
                 Date date = row.containsKey(WorkTables.TABLE_API_COL_DATE) ? row.get(WorkTables.TABLE_API_COL_DATE, now) : null;
                 Date date_recording = row.get(WorkTables.TABLE_API_COL_DATE_RECORDING, date);
                 Date date_last_exec = row.get(WorkTables.TABLE_API_COL_DATE_LAST_EXEC, date);
-                Date date_next_exec = row.containsKey(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC) ? row.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, now) : null;
+                Date date_next_exec = row.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, (Date) null);
                 int callcount = row.get(WorkTables.TABLE_API_COL_APICALL_COUNT, 1);
                 String unit = row.get(WorkTables.TABLE_API_COL_APICALL_SCHEDULE_UNIT, "days");
                 int time = row.get(WorkTables.TABLE_API_COL_APICALL_SCHEDULE_TIME, 0);

source/de/anomic/data/WorkTables.java

@@ -241,11 +241,11 @@ public class WorkTables extends Tables {
      * @param update if true then the next execution time is based on the latest computed execution time; othervise it is based on the last execution time
      */
     public static void calculateAPIScheduler(Tables.Data row, boolean update) {
-        Date date = row.containsKey(WorkTables.TABLE_API_COL_DATE) ? row.get(WorkTables.TABLE_API_COL_DATE, new Date()) : null;
+        Date date = row.containsKey(WorkTables.TABLE_API_COL_DATE) ? row.get(WorkTables.TABLE_API_COL_DATE, (Date) null) : null;
         date = update ? row.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, date) : row.get(WorkTables.TABLE_API_COL_DATE_LAST_EXEC, date);
         int time = row.get(WorkTables.TABLE_API_COL_APICALL_SCHEDULE_TIME, 1);
         if (time <= 0) {
-            row.remove(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC);
+            row.put(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, "");
             return;
         }
         String unit = row.get(WorkTables.TABLE_API_COL_APICALL_SCHEDULE_UNIT, "days");

source/de/anomic/search/Switchboard.java

@@ -1485,7 +1485,7 @@ public final class Switchboard extends serverSwitch {
                 while (mapIterator.hasNext()) {
                     row = mapIterator.next();
                     if (row == null) continue;
-                    Date date_next_exec = row.containsKey(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC) ? row.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, now) : null;
+                    Date date_next_exec = row.get(WorkTables.TABLE_API_COL_DATE_NEXT_EXEC, (Date) null);
                     if (date_next_exec == null) continue;
                     if (date_next_exec.after(now)) continue;
                     pks.add(new String(row.getPK()));              

source/net/yacy/kelondro/blob/Tables.java

@@ -180,6 +180,24 @@ public class Tables {
         return uk;
     }
 
+    public void insert(final String table, byte[] pk, Map<String, byte[]> map) throws IOException {
+        BEncodedHeap heap = getHeap(table);
+        try {
+            heap.insert(pk, map);
+        } catch (RowSpaceExceededException e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+    public void insert(final String table, Row row) throws IOException {
+        BEncodedHeap heap = getHeap(table);
+        try {
+            heap.insert(row.pk, row);
+        } catch (RowSpaceExceededException e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+    
     public void update(final String table, byte[] pk, Map<String, byte[]> map) throws IOException {
         BEncodedHeap heap = getHeap(table);
         try {