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

diff --git a/Makefile.am b/Makefile.am
index a485e2b..85fbc8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ dist-hook:
        for d in etc etc/settings etc/services www/test1 www/jsdemo www/iphone; do \
                mkdir -p $(distdir)/$$d; cp -r $$d/* $(distdir)/$$d; \
        done; rm -f $(distdir)/etc/pazpar2.cfg; exit 0
+       mkdir $(distdir)/rpm
+       -cp $(srcdir)/rpm/* $(distdir)/rpm
 
 .PHONY:debian
 debian:

diff --git a/pazpar2.spec b/pazpar2.spec
index ebea692..796c4eb 100644 (file)
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -82,10 +82,10 @@ cp etc/services/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/
 cp etc/settings/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/settings/
 cp etc/*.xsl ${RPM_BUILD_ROOT}/etc/pazpar2/
 mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d
-install -m755 src/pazpar2.rpm.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2
+install -m755 rpm/pazpar2.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2
 echo "Alias /pazpar2 /usr/share/pazpar2" >${RPM_BUILD_ROOT}/etc/pazpar2/ap2pazpar2-js.cfg
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
-install -m644 src/pazpar2.rpm.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/pazpar2
+install -m644 rpm/pazpar2.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/pazpar2
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}

diff --git a/rpm/pazpar2.init b/rpm/pazpar2.init
new file mode 100755 (executable)
index 0000000..c57d9e4
--- /dev/null
+++ b/rpm/pazpar2.init
@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# pazpar2      Startup script for Pazpar2
+#
+# chkconfig: 2345 85 15
+# description: Pazpar2 Metasearcher
+# processname: pazpar2
+# config: /etc/pazpar2/server.xml
+# config: /etc/sysconfig/pazpar2
+# pidfile: /var/run/pazpar2.pid
+
+# Source function library.
+OPTIONS="-l /var/log/pazpar2.log -f /etc/pazpar2/server.xml"
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/pazpar2 ]; then
+        . /etc/sysconfig/pazpar2
+fi
+
+# Path to the apachectl script, server binary, and short-form for messages.
+DAEMON=${DAEMON-/usr/sbin/pazpar2}
+prog=pazpar2
+pidfile=${PIDFILE-/var/run/pazpar2.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/pazpar2}
+RETVAL=0
+
+start() {
+        echo -n $"Starting $prog: "
+        daemon --pidfile=${pidfile} $DAEMON $OPTIONS -D -p ${pidfile}
+        RETVAL=$?
+        echo
+        [ $RETVAL = 0 ] && touch ${lockfile}
+        return $RETVAL
+}
+
+stop() {
+       echo -n $"Stopping $prog: "
+       killproc -p ${pidfile} -d 10 $DAEMON
+       RETVAL=$?
+       echo
+       [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+reload() {
+    stop
+    start
+}
+
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  status)
+        status -p ${pidfile} $DAEMON
+       RETVAL=$?
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  condrestart)
+       if [ -f ${pidfile} ] ; then
+               stop
+               start
+       fi
+       ;;
+  reload)
+        reload
+       ;;
+  configtest)
+       $DAEMON $OPTIONS -t
+       RETVAL=$?
+       ;;
+  *)
+       echo $"Usage: $prog {start|stop|restart|help|configtest}"
+       exit 1
+esac
+
+exit $RETVAL

diff --git a/rpm/pazpar2.logrotate b/rpm/pazpar2.logrotate
new file mode 100644 (file)
index 0000000..b2bd6fb
--- /dev/null
+++ b/rpm/pazpar2.logrotate
@@ -0,0 +1,13 @@
+/var/log/pazpar2.log {
+       weekly
+       missingok
+       rotate 4
+       compress
+       delaycompress
+       notifempty
+       postrotate
+               if [ -f /var/run/pazpar2.pid ]; then
+                       /sbin/service pazpar2 restart > /dev/null
+               fi
+       endscript
+}

diff --git a/src/Makefile.am b/src/Makefile.am
index c956188..bc9be7b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,6 @@
 sbin_PROGRAMS = pazpar2
 noinst_PROGRAMS = pazpar2_play
 
-EXTRA_DIST = pazpar2.rpm.init pazpar2.rpm.logrotate
-
 check_PROGRAMS = \
       test_sel_thread \
       test_normalize

diff --git a/src/pazpar2.rpm.init b/src/pazpar2.rpm.init
deleted file mode 100755 (executable)
index da5d642..0000000
--- a/src/pazpar2.rpm.init
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-# pazpar2      Startup script for Pazpar2
-#
-# chkconfig: - 85 15
-# description: Pazpar2 Metasearcher
-# processname: pazpar2
-# config: /etc/pazpar2/server.xml
-# config: /etc/sysconfig/pazpar2
-# pidfile: /var/run/pazpar2.pid
-
-# Source function library.
-OPTIONS="-l /var/log/pazpar2.log -f /etc/pazpar2/server.xml"
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/pazpar2 ]; then
-        . /etc/sysconfig/pazpar2
-fi
-
-# Path to the apachectl script, server binary, and short-form for messages.
-DAEMON=${DAEMON-/usr/sbin/pazpar2}
-prog=pazpar2
-pidfile=${PIDFILE-/var/run/pazpar2.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/pazpar2}
-RETVAL=0
-
-start() {
-        echo -n $"Starting $prog: "
-        daemon --pidfile=${pidfile} $DAEMON $OPTIONS -D -p ${pidfile}
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch ${lockfile}
-        return $RETVAL
-}
-
-stop() {
-       echo -n $"Stopping $prog: "
-       killproc -p ${pidfile} -d 10 $DAEMON
-       RETVAL=$?
-       echo
-       [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-}
-reload() {
-    stop
-    start
-}
-
-# See how we were called.
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  status)
-        status -p ${pidfile} $DAEMON
-       RETVAL=$?
-       ;;
-  restart)
-       stop
-       start
-       ;;
-  condrestart)
-       if [ -f ${pidfile} ] ; then
-               stop
-               start
-       fi
-       ;;
-  reload)
-        reload
-       ;;
-  configtest)
-       $DAEMON $OPTIONS -t
-       RETVAL=$?
-       ;;
-  *)
-       echo $"Usage: $prog {start|stop|restart|help|configtest}"
-       exit 1
-esac
-
-exit $RETVAL

diff --git a/src/pazpar2.rpm.logrotate b/src/pazpar2.rpm.logrotate
deleted file mode 100644 (file)
index b2bd6fb..0000000
--- a/src/pazpar2.rpm.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/pazpar2.log {
-       weekly
-       missingok
-       rotate 4
-       compress
-       delaycompress
-       notifempty
-       postrotate
-               if [ -f /var/run/pazpar2.pid ]; then
-                       /sbin/service pazpar2 restart > /dev/null
-               fi
-       endscript
-}

diff --git a/www/jsdemo/example_client.js b/www/jsdemo/example_client.js
index fd9c37e..8342494 100644 (file)
--- a/www/jsdemo/example_client.js
+++ b/www/jsdemo/example_client.js
@@ -13,7 +13,7 @@ if (document.location.hash == '#useproxy') {
     showResponseType = 'json';
 }
 
-my_paz = new pz2( { "onshow": my_onshow,
+var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
                     "pazpar2path": pazpar2path,
                     "oninit": my_oninit,
@@ -245,7 +245,7 @@ function drawPager (pagerDiv)
 
     var prev = '<span id="prev">&#60;&#60; Prev</span><b> | </b>';
     if (curPage > 1)
-        var prev = '<a href="#" id="prev" onclick="pagerPrev();">'
+        prev = '<a href="#" id="prev" onclick="pagerPrev();">'
         +'&#60;&#60; Prev</a><b> | </b>';
 
     var middle = '';
@@ -260,14 +260,14 @@ function drawPager (pagerDiv)
     
     var next = '<b> | </b><span id="next">Next &#62;&#62;</span>';
     if (pages - curPage > 0)
-    var next = '<b> | </b><a href="#" id="next" onclick="pagerNext()">'
+        next = '<b> | </b><a href="#" id="next" onclick="pagerNext()">'
         +'Next &#62;&#62;</a>';
 
-    predots = '';
+    var predots = '';
     if (firstClkbl > 1)
         predots = '...';
 
-    postdots = '';
+    var postdots = '';
     if (lastClkbl < pages)
         postdots = '...';