validate all controlled subfields in a tag

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10321 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.js b/Open-ILS/xul/staff_client/server/cat/marcedit.js
index 7c82fed..e27536d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.js
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.js
@@ -1893,35 +1893,44 @@ function validateAuthority (button) {
                var tag = row.firstChild;
 
                if (!control_map[tag.value]) continue
+               button.setAttribute('label', label + ' - ' + tag.value);
 
                var ind1 = tag.nextSibling;
                var ind2 = ind1.nextSibling;
                var subfields = ind2.nextSibling.childNodes;
 
+        var tags = {};
+
                for (var j = 0; j < subfields.length; j++) {
                        var sf = subfields[j];
+            var sf_code = sf.childNodes[1].value;
+            var sf_value = sf.childNodes[1].value;
 
-                       if (!control_map[tag.value][sf.childNodes[1].value]) continue;
-
-                       button.setAttribute('label', label + ' - ' + tag.value + sf.childNodes[1].value);
+                       if (!control_map[tag.value][sf_code]) continue;
 
                        var found = 0;
-                       for (var k in control_map[tag.value][sf.childNodes[1].value]) {
-                               var x = searchAuthority(sf.childNodes[2].value, k, control_map[tag.value][sf.childNodes[1].value][k], 1);
-                               var res = new XML( x.responseText );
-
-                               if (res.gw::payload.gw::array.gw::string.length()) {
-                                       found = 1;
-                                       break;
-                               }
+                       for (var a_tag in control_map[tag.value][sf_code]) {
+                if (!tags[a_tag]) tags[a_tag] = [];
+                tags[a_tag].push({ term : sf_value, subfield : sf_code });
                        }
 
-                       if (!found) {
+               }
+
+        for (var val_tag in tags) {
+               var auth_data = validateBibField( [val_tag], tags[val_tag]);
+               var res = new XML( auth_data.responseText );
+               found = parseInt( res.gw::payload.gw::array.gw::string );
+            if (found) break;
+        }
+
+               for (var j = 0; j < subfields.length; j++) {
+                       var sf = subfields[j];
+                       if (!found) {
                                sf.childNodes[2].inputField.style.color = 'red';
                        } else {
                                sf.childNodes[2].inputField.style.color = 'black';
                        }
-               }
+        }
        }
 
        button.setAttribute('label', label);
@@ -1930,6 +1939,19 @@ function validateAuthority (button) {
 }
 
 
+function validateBibField (tags, searches) {
+       var url = "/gateway?input_format=json&format=xml&service=open-ils.search&method=open-ils.search.authority.validate.tag";
+       url += '&param="tags"&param=' + js2JSON(tags);
+       url += '&param="searches"&param=' + js2JSON(searches);
+
+
+       var req = new XMLHttpRequest();
+       req.open('GET',url,false);
+       req.send(null);
+
+       return req;
+
+}
 function searchAuthority (term, tag, sf, limit) {
        var url = "/gateway?input_format=json&format=xml&service=open-ils.search&method=open-ils.search.authority.fts";
        url += '&param="term"&param="' + term + '"';

diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.xul b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
index d42c4c2..126da26 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
@@ -13,6 +13,7 @@
 
 <script src="marcedit.js" type="application/x-javascript; e4x=1"/>
 <script src="/opac/common/js/CGI.js" type="application/x-javascript; e4x=1"/>
+<script src="/opac/common/js/JSON_v1.js" type="application/x-javascript; e4x=1"/>
 
 <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />