Merge pull request #191 from switowski/2016-09-19-bibsword-module

Updated version of bibsword module
CERNDocumentServer · Sep 26, 2016 · 6d01a09 · 6d01a09
2 parents 1f985ff + a317f91
commit 6d01a09
Show file tree

Hide file tree

Showing 19 changed files with 6,341 additions and 5,750 deletions.
diff --git a/configure.ac b/configure.ac
@@ -775,6 +775,7 @@ AC_CONFIG_FILES([config.nice  \
      modules/bibsword/doc/admin/Makefile \
      modules/bibsword/doc/hacking/Makefile \
      modules/bibsword/lib/Makefile \
+     modules/bibsword/lib/client_servers/Makefile \
      modules/bibsword/etc/Makefile \
      modules/bibupload/bin/Makefile \
      modules/bibupload/bin/bibupload \

diff --git a/modules/bibformat/lib/elements/bfe_sword_push.py b/modules/bibformat/lib/elements/bfe_sword_push.py
@@ -38,14 +38,12 @@ def format_element(bfo, remote_server_id, link_label="Push via Sword"):
         return ""
 
     sword_arguments = {'ln': bfo.lang,
-                       'recid': bfo.recID}
+                       'record_id': bfo.recID}
 
     if remote_server_id:
-        sword_arguments['id_remote_server'] = remote_server_id
-    else:
-        sword_arguments['status'] = 'select_server'
+        sword_arguments['server_id'] = remote_server_id
 
-    return create_html_link(CFG_BASE_URL + '/bibsword',
+    return create_html_link(CFG_BASE_URL + '/sword_client/submit',
                             sword_arguments,
                             link_label)
 

diff --git a/modules/bibsword/lib/Makefile.am b/modules/bibsword/lib/Makefile.am
@@ -15,16 +15,16 @@
 # along with Invenio; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
+SUBDIRS = client_servers
+
 pylibdir = $(libdir)/python/invenio
 
 pylib_DATA = bibsword_config.py \
-             bibsword_client_dblayer.py \
-             bibsword_client_formatter.py \
-             bibsword_client_http.py \
              bibsword_client.py \
+             bibsword_client_dblayer.py \
+             bibsword_client_server.py \
              bibsword_client_templates.py \
-             bibsword_webinterface.py \
-             bibsword_client_tester.py
+             bibsword_webinterface.py
 
 EXTRA_DIST = $(pylib_DATA)