Changeset 38297

Timestamp:

2023-10-06T18:15:02+13:00 (2 months ago)

Author:

davidb

Message:

Further development, but starting to realize 'extra' orthogonal not designed to run at the point we want

Location:

gs3-extensions/structured-image/trunk/perllib

Files:

• plugins/GoogleVisionAPIConverter.pm (modified) (2 diffs)
• sasOpenAnnotationBuildproc.pm (modified) (5 diffs)

gs3-extensions/structured-image/trunk/perllib/plugins/GoogleVisionAPIConverter.pm

@@ -461 +461 @@
 
     my $self_openannotation_resources = $self->{'openannotation-list'}->{'resources'};
-
+    my $top_section = $doc_obj->get_top_section();
+    
     my $block_i = 0;
 
@@ -470 +471 @@
 
     my $annotation_id_uri = "${uri_prefix}${OID_with_section}/annotation/gv-block-$block_i";
-        
+    $doc_obj->add_utf8_metadata($top_section, "GoogleVisionBlocks", $annotation_id_uri);
+    
     my $openannotation_resource = {
         "\@context"  => "http://iiif.io/api/presentation/2/context.json",

gs3-extensions/structured-image/trunk/perllib/sasOpenAnnotationBuildproc.pm

@@ -64 +64 @@
     my $build_dir  = $self->{'build_dir'};
 
-    # full path to adb database
-#    my $adb_filename 
-#   = &util::filename_cat($build_dir, "sasOpenAnnotation", "lsh-features.adb");
 
     # get doc id
@@ -76 +73 @@
     
     if ((defined $tl_contains_openannotation_json) && ($tl_contains_openannotation_json eq "1")) {
-    print STDERR "*** ### Processing $doc_oid for its OpenAnnotation associated files\n";
-    
+
+    print STDERR "**** Hardwiring port value to: 8383\n";
+    my $gs_http_port   = "8383";    
+    my $site           = $self->{'site'};       
+    my $collect        = $ENV{'GSDLCOLLECTION'};
+    my $gs_library_url = "http://localhost:${gs_http_port}/greenstone3/library";
+        
+    my $internal_url_base = "http://localhost:${gs_http_port}/simpleAnnotationStore/annotation";
+
+    my $destroy_delete_url = "${internal_url_base}/destroy";
+    my $populate_post_url  = "${internal_url_base}/populate";
+
+    # First remove any previous gv-blocks
+    my $gv_block_uris = $doc_obj->get_metadata($top_section,"GoogleVisionBlocks");
+    for my $gv_block_uri (@$gv_block_uris) {
+        print $outhandle "  Deleting previous OpenAnnotation GV-block:\n    $gv_block_uri\n";
+
+        my $cmd = "curl --silent -X DELETE $destroy_delete_url?uri=${gv_block_uri}";
+        
+        my $status = system($cmd);
+        if ($status != 0) {
+        print STDERR "Error: failed to run:\n  $cmd\n$!\n";
+        }
+        
+    }
+            
     # map to assoc dir
     my $assoc_file  = $doc_obj->get_metadata_element ($top_section,"assocfilepath");
     # my $assoc_filename = &util::filename_cat($source_dir,$assoc_file);
 
-    my $tl_root_oa_id = "openannotation-list";
-
-    my $gs_http_port = "8383";
-        
-    my $internal_url_base = "http://localhost:${gs_http_port}/simpleAnnotationStore/annotation";
-    my $post_url="${internal_url_base}/populate";
-
-    my $gs_library_url = "http://localhost:${gs_http_port}/greenstone3/library";
-    my $site           = $self->{'site'};       
-    my $collect        = $ENV{'GSDLCOLLECTION'};
+    my $tl_root_oa_id = "openannotation-list";  
+    my $iuri_prefix = "$gs_library_url/sites/$site/collect/$collect/index/assoc/$assoc_file/";
     
-    my $iuri_prefix = "$gs_library_url/sites/$site/collect/$collect/index/assoc/$assoc_file/";
-
-    
-
     # For each page:
     #    send the openannotation-list<n>.json to SAS endpoint
@@ -115 +124 @@
         $sec_oa_file .= ".json";
 
-        #my $sec_oa_filename = &util::filename_cat($assoc_filename,$sec_oa_file);
-                
         print $outhandle "  Inserting Open Annotation for $doc_oid.$section\n";
 
@@ -122 +129 @@
         my $iuri="${iuri_prefix}${iuri_tail}";
 
-        my $cmd = "curl -X POST -d \"uri=${iuri}\" \"$post_url\"";
-        print STDERR "!!!!! cmd = $cmd\n";
-        
+        my $cmd = "curl --silent -X POST -d \"uri=${iuri}\" \"$populate_post_url\"";
         
         my $status = system($cmd);
@@ -133 +138 @@
         $section = $doc_obj->get_next_section($section);
     }
-    }
-    
-    
-#    my $chr12_filename = &util::filename_cat($assoc_filename,"doc.chr12");
-#    my $powerlog_filename = &util::filename_cat($assoc_filename,"doc.power");
-
-#    print $outhandle "  Inserting features for $doc_oid\n";
-
-#    my $cmd = "sasOpenAnnotation -d \"$adb_filename\" -I -k \"$doc_oid\" -f \"$chr12_filename\" -w \"$powerlog_filename\"";
-
-#    my $status = system($cmd);
-#    if ($status != 0) {
-#   print STDERR "Error: failed to run:\n  $cmd\n$!\n";
-#    }
+    }        
 }