Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/src/database.c b/src/database.c
index d59ce34..2940c25 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -100,7 +100,8 @@ struct database *create_database_for_service(const char *id,
         if (!strcmp(p->id, id))
             return p;
     
-    yaz_log(YLOG_DEBUG, "new database %s under service %s", id, service->id);
+    yaz_log(YLOG_DEBUG, "new database %s under service %s", id,
+       service->id ? service->id : "null");
     p = new_database_inherit_settings(id, service->nmem, service->settings);
     p->next = service->databases;
     service->databases = p;

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index b221d10..ff03af6 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -153,7 +153,7 @@ if [ -z "$SKIP_PAZPAR2" ] ; then
 fi
 
 # clean out empty diff files
-find . -name "$TEST*.dif" -empty -delete 
+find . -name "$TEST*.dif" -size 0c -print|xargs rm
 
 exit $code