From ae826ef2ebc47ce6ffff204e2da9fb4e810a493e Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 7 Nov 2008 04:13:08 +0000
Subject: [PATCH] - API: remove debugging printf from trickly down code - API:
 use non-verbose option to zip - scheduler: if multiple_client_per_host is
 set,     don't mark results as over if get repeat CPID

svn path=/trunk/boinc/; revision=16445
---
 api/boinc_api.cpp        |  1 -
 checkin_notes            | 16 +++++++++++++++-
 sched/handle_request.cpp |  8 ++++++--
 sched/sched_send.cpp     |  3 ++-
 zip/boinc_zip.cpp        |  5 ++---
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index c14ee53cae..8a98f7d487 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -1088,7 +1088,6 @@ int boinc_receive_trickle_down(char* buf, int len) {
         relative_to_absolute("", path);
         DirScanner dirscan(path);
         while (dirscan.scan(filename)) {
-            fprintf(stderr, "scan: %s\n", filename.c_str());
             if (strstr(filename.c_str(), "trickle_down")) {
                 strncpy(buf, filename.c_str(), len);
                 return true;
diff --git a/checkin_notes b/checkin_notes
index 6df543a64a..1932c63a12 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9271,7 +9271,7 @@ Rom    5 Nov 2008
         BOINCBaseFrame.cpp
         BOINCTaskBar.cpp
 
-Charlie 4 Nov 2008
+Charlie 5 Nov 2008
     - Mac: Add new source files mac_address.cpp,.h to XCode project.
     - MGR: Fix compiler warnings on non-Windows builds.
     - MGR: Filter wxEVT_TASKBAR_MOVE events only on Windows.
@@ -9283,3 +9283,17 @@ Charlie 4 Nov 2008
      mac_build/
         boinc.xcodeproj/
             project.pbxproj
+
+David  6 Nov
+    - API: remove debugging printf from trickly down code
+    - API: use non-verbose option to zip
+    - scheduler: if multiple_client_per_host is set,
+        don't mark results as over if get repeat CPID
+
+    api/
+        boinc_api.C
+    sched/
+        sched_send.cpp
+        handle_request.cpp
+    zip/
+        boinc_zip.cpp
diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp
index 67fe228d48..8df56fa226 100644
--- a/sched/handle_request.cpp
+++ b/sched/handle_request.cpp
@@ -383,7 +383,9 @@ lookup_user_and_make_new_host:
                     "[HOST#%d] [USER#%d] User has another host with same CPID.\n",
                     host.id, host.userid
                 );
-                mark_results_over(host);
+                if (!config.multiple_clients_per_host) {
+                    mark_results_over(host);
+                }
                 goto got_host;
             }
         }
@@ -404,7 +406,9 @@ make_new_host:
                 "[HOST#%d] [USER#%d] Found similar existing host for this user - assigned.\n",
                 host.id, host.userid
             );
-            mark_results_over(host);
+            if (!config.multiple_clients_per_host) {
+                mark_results_over(host);
+            }
             goto got_host;
         }
         // either of the above cases,
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index 1377224ff3..b49a482341 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -1079,7 +1079,8 @@ int add_result_to_reply(
         } else {
             DB_WORKUNIT dbwu;
             char buf[256];
-            sprintf(buf, "target_nresults=%d, min_quorum=%d, transition_time=%ld",
+            sprintf(buf,
+                "target_nresults=%d, min_quorum=%d, transition_time=%ld",
                 app->target_nresults, app->target_nresults, time(0)
             );
             dbwu.id = wu.id;
diff --git a/zip/boinc_zip.cpp b/zip/boinc_zip.cpp
index c7ba2baaf6..2c3480b3cc 100644
--- a/zip/boinc_zip.cpp
+++ b/zip/boinc_zip.cpp
@@ -113,8 +113,7 @@ int boinc_zip(int bZipType, const std::string szFileZip,
                 strcpy(av[0], "zip");
                 // default zip options -- no dir names, no subdirs, highest compression, quiet mode
                 if (strlen(av[1])==0)
-                        strcpy(av[1], "-j9");
-                        //strcpy(av[1], "-9jq");
+                        strcpy(av[1], "-j9q");
                 strcpy(av[2], szFileZip.c_str());
 
                 //sz 3 onward will be each vector
@@ -127,7 +126,7 @@ int boinc_zip(int bZipType, const std::string szFileZip,
                 strcpy(av[0], "unzip");
                 // default unzip options -- preserve subdirs, overwrite 
                 if (strlen(av[1])==0)
-                        strcpy(av[1], "-o");
+                        strcpy(av[1], "-oq");
                 strcpy(av[2], szFileZip.c_str());
 
                 // if they passed in a directory unzip there