Only add hold when results are closed

MachinePublishers · Apr 13, 2015 · d082c76 · d082c76
1 parent 3d7b5dc
commit d082c76
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/api/src/com/screenslicer/api/datatype/Result.java b/api/src/com/screenslicer/api/datatype/Result.java
@@ -173,6 +173,10 @@ public void close() {
     }
   }
 
+  public boolean isClosed() {
+    return key != null;
+  }
+
   public void remove() {
     try {
       if (key != null) {
@@ -184,16 +188,16 @@ public void remove() {
     }
   }
 
-  public static boolean hasHold() {
+  public static boolean hasHolds() {
     return holdCount.get() != 0;
   }
 
-  public static void removeHold(int num) {
-    holdCount.addAndGet(-1 * num);
+  public static void removeHold() {
+    holdCount.decrementAndGet();
   }
 
-  public static void addHold(int num) {
-    holdCount.addAndGet(num);
+  public static void addHold() {
+    holdCount.incrementAndGet();
   }
 
   public boolean open() {

diff --git a/core/src/com/screenslicer/core/scrape/Scrape.java b/core/src/com/screenslicer/core/scrape/Scrape.java
@@ -843,7 +843,11 @@ public static List<Result> scrape(Query query, Request req) {
           ret = scrape(query, req, 0, i + 1 == MAX_INIT, media, cache, myThread);
           Log.info("Scrape finished");
           List<Result> searchResults = ret.drain();
-          Result.addHold(searchResults.size());
+          for (Result result : searchResults) {
+            if (result.isClosed()) {
+              Result.addHold();
+            }
+          }
           return searchResults;
         } catch (Browser.Fatal f) {
           Log.exception(f);