Changeset 24946

Timestamp:

2012-01-13T11:51:18+13:00 (12 years ago)

Author:

sjm84

Message:

Continued work on photo note deletion

File:

• main/trunk/model-cols-dev/peijones/etc/collectionConfig.xml (modified) (2 diffs)

main/trunk/model-cols-dev/peijones/etc/collectionConfig.xml

@@ -220 +220 @@
                         function deleteFunction(note)
                         {
-                            var callback =
-                            {
-                                success: function(response)
-                                {
-                                    var updateURL = gs.siteMetadata.siteURL.replace("8080","9090") + gs.xsltParams.library_name + "?a=s&sa=c";
-                                
-                                    var updateCallback = 
-                                    {
-                                        success: function(response){},
-                                        failed: function(){alert("Failed in deleteFunction() to update Greenstone server with: " + updateURL);}
-                                    };
-                                    
-            
-                                    YAHOO.util.Connect.asyncRequest("GET", updateURL, updateCallback);
-                                },
-                                failed: function(){ alert("Failed in deleteFunction() with note id: " + note.id)},
-                            };
-                            
                             var status = true;
                             
                             if (note && note.id && note.id > 0) {
                                 var metaposStr =  note.id - 1;
-                            
-                                var url = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=remove-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metapos=" + metaposStr;
-                                YAHOO.util.Connect.asyncRequest("GET", url, callback);
+                                
+                                var jsonVal = '{"caption":"' + note.text + '", "area":{"x":' + note.rect.left + ', "y":' + note.rect.top + ', "width":' + note.rect.width + ', "height":' + note.rect.height + '}}';
+                            
+                                var removeFromIndexURL = "cgi-bin/metadata-server.pl?a=remove-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metapos=" + metaposStr;
+                                var removeFromArchivesURL = "cgi-bin/metadata-server.pl?a=remove-archives-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metapos=" + metaposStr;
+                                var removeFromImportURL = "cgi-bin/metadata-server.pl?a=remove-import-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal;
+                                
+                                var indexCallback =
+                                {
+                                    success: function(response)
+                                    {
+                                        for(var i = 0; i < _notes.length; i++)
+                                        {
+                                            var currentNote = _notes[i];
+                                            if(currentNote.id > note.id)
+                                            {
+                                                currentNote.id--;
+                                            }
+                                        }
+                                    },
+                                    failed: function(){alert("Failed to delete index metadata of note with id: " + note.id);},
+                                };
+                                
+                                var archiveCallback = 
+                                {
+                                    success: function(){buildFunction(gs.cgiParams.c);},
+                                    failed: function(){alert("Failed to delete archive metadata of note with id: " + note.id);}
+                                }
+                                
+                                var importCallback =
+                                {
+                                    success: function(){},
+                                    failed: function(){alert("Failed to delete import metadata of note with id: " + note.id);}
+                                }
+                                
+                                YAHOO.util.Connect.asyncRequest("GET", removeFromIndexURL, indexCallback);
+                                YAHOO.util.Connect.asyncRequest("GET", removeFromArchivesURL, archiveCallback);
+                                YAHOO.util.Connect.asyncRequest("GET", removeFromImportURL, callback);
                             }
                             else {
@@ -277 +294 @@
                             var metaposStr = (note && note.id && note.id > 0) ? note.id - 1 : _posCount;
                             
-                            var saveIndexURL = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=set-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;
-                            var saveArchivesURL = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=set-archives-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;
-                            var saveImportURL = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=set-import-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;
+                            var saveIndexURL = "cgi-bin/metadata-server.pl?a=set-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;
+                            var saveArchivesURL = "cgi-bin/metadata-server.pl?a=set-archives-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;
+                            var saveImportURL = "cgi-bin/metadata-server.pl?a=set-import-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;
                             YAHOO.util.Connect.asyncRequest("GET", saveIndexURL, saveIndexCallback);
                             YAHOO.util.Connect.asyncRequest("GET", saveArchivesURL, saveArchivesCallback);