Changeset 37590 for main

Timestamp:

2023-03-28T17:14:13+13:00 (13 months ago)

Author:

davidb

Message:

removed hardcoded 8383 port

File:

• main/trunk/greenstone3/web/interfaces/default/js/utility_scripts.js (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/js/utility_scripts.js

@@ -301 +301 @@
    const mod_meta_base_url = gs.xsltParams.library_name + "?a=g&rt=r&ro=0&s=ModifyMetadata&s1.collection=" + gs.cgiParams.c + "&s1.site=" + gs.xsltParams.site_name + "&s1.d=" + gs.cgiParams.d;
    const interface_bootstrap_images = "interfaces/" + gs.xsltParams.interface_name + "/images/bootstrap/"; // path to toolbar images
+   const GSSTATUS_SUCCESS = 11; // more information on codes found in: GSStatus.java
 
    let editMode = false;
@@ -1419 +1420 @@
       if (dualMode) {
          if (!secondaryLoaded) {
-            const secondaryCSVURL = "http://localhost:8383/greenstone3/cgi-bin/metadata-server.pl?a=get-archives-assocfile&site=" + gs.xsltParams.site_name + "&c=" + gs.collectionMetadata.indexStem + 
+            // const secondaryCSVURL = "http://localhost:8383/greenstone3/cgi-bin/metadata-server.pl?a=get-archives-assocfile&site=" + gs.xsltParams.site_name + "&c=" + gs.collectionMetadata.indexStem + 
+            //                         "&d=" + gs.documentMetadata.Identifier + "&assocname=structured-audio.csv&dv=nminus-1";
+            const secondaryCSVURL = gs.variables.metadataServerURL + "?a=get-archives-assocfile&site=" + gs.xsltParams.site_name + "&c=" + gs.collectionMetadata.indexStem + 
                                     "&d=" + gs.documentMetadata.Identifier + "&assocname=structured-audio.csv&dv=nminus-1";
             loadCSVFile(secondaryCSVURL, secondarySet);
@@ -2355 +2358 @@
          }).then((out) => {
             console.log('fldv inc success with status code: ' + out.page.pageResponse.status.code);
-            if (out.page.pageResponse.status.code == 11) { // more information on codes found in: GSStatus.java
+            if (out.page.pageResponse.status.code == GSSTATUS_SUCCESS) { 
                ajaxSetCommitMeta();
             }
@@ -2372 +2375 @@
       }).then((out) => {
          console.log('commit success with status code: ' + out.page.pageResponse.status.code);
-         if (out.page.pageResponse.status.code == 11) {
+         if (out.page.pageResponse.status.code == GSSTATUS_SUCCESS) {
             ajaxSetAssocFile();
          }