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

Conflicts:
	www/iphone/example_client.js

Fix: added md-author in branch. Added recIDs on head.

diff --git a/.cproject b/.cproject
index 370e803..6fed192 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -43,6 +43,7 @@
                                                                <option id="gnu.c.compiler.macosx.exe.debug.option.debugging.level.88106198" name="Debug Level" superClass="gnu.c.compiler.macosx.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
                                                                <option id="gnu.c.compiler.option.include.paths.16758435" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/yaz/include}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="/usr/local/include"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1159745856" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>

diff --git a/m4 b/m4
index eda6995..96ff03f 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit eda6995523f2412995ee60b5fe6443dee3e0d156
+Subproject commit 96ff03f91b4539e315dadd50ab2564412c076394

diff --git a/src/connection.c b/src/connection.c
index 1c7d467..4be296f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -261,6 +261,7 @@ static void non_block_events(struct connection *co)
         default:
             yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
                     ev, client_get_id(cl));
+            break;
         }
     }
     if (got_records)
@@ -573,21 +574,21 @@ int client_prep_connection(struct client *cl,
                 }
                 if (co)
                 {
-                    yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_connections);
+                    yaz_log(YLOG_LOG, "Host %s: num_connections = %d (reusing)", host->hostport, num_connections);
                     break;
                 }
             }
             if (max_connections <= 0 || num_connections < max_connections)
             {
-                yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
-                        num_connections, max_connections);
+                yaz_log(YLOG_LOG, "Host %s: num_connections = %d (new); max = %d",
+                        host->hostport, num_connections, max_connections);
                 break;
             }
-            yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d",
-                    num_connections, max_connections);
+            yaz_log(YLOG_LOG, "Host %s: num_connections = %d (waiting) max = %d",
+                    host->hostport, num_connections, max_connections);
             if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
             {
-                yaz_log(YLOG_LOG, "out of connections %s", client_get_id(cl));
+                yaz_log(YLOG_LOG, "Host %s: out of connections %s", host->hostport, client_get_id(cl));
                 client_set_state(cl, Client_Error);
                 yaz_mutex_leave(host->mutex);
                 return 0;
@@ -595,7 +596,7 @@ int client_prep_connection(struct client *cl,
         }
         if (co)
         {
-            yaz_log(YLOG_LOG,  "%p Connection reuse. state: %d", co, co->state);
+            yaz_log(YLOG_LOG,  "Host %s: %p Connection reuse. state: %d", host->hostport, co, co->state);
             connection_release(co);
             client_set_connection(cl, co);
             co->client = cl;
@@ -612,8 +613,9 @@ int client_prep_connection(struct client *cl,
         else
         {
             yaz_mutex_leave(host->mutex);
-            co = connection_create(cl, host, operation_timeout, session_timeout,
-                                   iochan_man);
+            co = connection_create(cl, host, operation_timeout, session_timeout, iochan_man);
+            yaz_log(YLOG_LOG, "Host %s: %p Connection new", host->hostport, co);
+
         }
         assert(co->host);
     }

diff --git a/www/iphone/example_client.js b/www/iphone/example_client.js
index a336f8e..3edabac 100644 (file)
--- a/www/iphone/example_client.js
+++ b/www/iphone/example_client.js
@@ -181,12 +181,15 @@ function my_onshow(data) {
                  +'<a href="#" id="rec_'+hit.recid
                  +'" onclick="showDetails(this.id);return false;">' 
                  + hit["md-title"] +'</a> '); 
-       if (hit["md-title-responsibility"] !== undefined) {
+       if (hit["md-title-remainder"] !== undefined) {
+           html.push('<a href="#">' + hit["md-title-remainder"] + ' </a> ');
+       }
+       if (hit["md-author"] != undefined) {
+           html.push('<a href="#">'+hit["md-author"]+'</a> ');
+       }
+       else if (hit["md-title-responsibility"] !== undefined) {
            html.push('<a href="#">'+hit["md-title-responsibility"]+'</a> ');
-           if (hit["md-title-remainder"] !== undefined) {
-               html.push('<a href="#">' + hit["md-title-remainder"] + ' </a> ');
-           }
-       }
+       }
         if (hit.recid == curDetRecId) {
             html.push(renderDetails_iphone(curDetRecData));
         }
@@ -699,8 +702,8 @@ function renderDetails(data, marker)
        if (data["md-title-remainder"] !== undefined) {
              details += ' : <span>' + data["md-title-remainder"] + ' </span>';
        }
-       if (data["md-title-responsibility"] !== undefined) {
-             details += ' <span><i>'+ data["md-title-responsibility"] +'</i></span>';
+       if (data["md-author"] !== undefined) {
+             details += ' <span><i>'+ data["md-auhtor"] +'</i></span>';
        }
          details += '</td></tr>';
     }
@@ -757,7 +760,9 @@ function renderDetails_iphone(data, marker)
         if (data["md-title-remainder"] !== undefined) {
              details += ' ' + data["md-title-remainder"] + ' ';
         }
-        if (data["md-title-responsibility"] !== undefined) {
+        if (data["md-author"] !== undefined) {
+             details += '<i>'+ data["md-author"] +'</i>';
+        } else if (data["md-title-responsibility"] !== undefined) {
              details += '<i>'+ data["md-title-responsibility"] +'</i>';
         }
         details += '</big>'