Changeset 37060

Timestamp:

2022-12-25T18:07:37+13:00 (5 months ago)

Author:

davidb

Message:

Removed the 'allinone' version of functions

File:

• gs3-extensions/structured-image/trunk/perllib/plugins/GoogleVisionAPIConverter.pm (modified) (2 diffs)

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

@@ -341 +341 @@
     $self->{'openannotation-list'} = $openannotation_list;
 }
-
-
-
-sub start_openannotation_list_ALLINONE
-{
-    my $self = shift (@_);
-    my ($doc_obj) = @_;
-
-    my $OID = $doc_obj->get_OID();
-
-    my $openannotation_list = {
-        "\@context" => "http://www.shared-canvas.org/ns/context.json",
-    # "\@id"      => "https://iiif.harvardartmuseums.org/manifests/object/299843/list/47174896", 
-    "\@id"      => "${OID}/openannotation-list.json",  # #### **** make full URL to be unique? or greenstone3:site:collect:OID ??
-    "\@type"    => "sc:AnnotationList",
-    "resources" => []
-    };
-
-    $self->{'openannotation-list'} = $openannotation_list;
-}
-
 
     
@@ -592 +571 @@
 
 
-
-sub openannotation_list_associate_json_ALLINONE
-{
-    my $self = shift (@_);
-    my ($doc_obj, $gv_dococr_json_filename_recs) = @_;
-
-    my $outhandle = $self->{'outhandle'};
-    
-    # Guaranteed to have at least one value in gv_dococr_json_filename_recs
-    #
-    # Legacy code used to have a '\d+' just before the '.json' reflecting page/section number
-    # Keep this in the regular expression, just in case,
-    # 
-    my ($gv_dococr_filename_root) = ($gv_dococr_json_filename_recs->[0]->{'filename'} =~ m/^(.+)(?:\d+)?\.json$/);
-
-    # slight of hand so new directory spot in cache_dir picked out is where we want it!
-    $gv_dococr_filename_root .= "/";
-    
-    my $collect_dir = $ENV{'GSDLCOLLECTDIR'};
-    my $toplevel_cached_dir = &FileUtils::filenameConcatenate($collect_dir,"cached");
-    
-    $self->init_cache_for_file($gv_dococr_filename_root);
-    my $cached_dir = $self->{'cached_dir'};
-
-    my $assoc_openannotation_json_ofile = "openannotation-list.json";
-    my $cached_openannotation_json_ofilename = &FileUtils::filenameConcatenate($cached_dir,$assoc_openannotation_json_ofile);    
-
-    my $needs_json_regen = 0;
-
-    if (!-f $cached_openannotation_json_ofilename) {
-    $needs_json_regen = 1;
-    }
-    else {
-    for my $gv_json_filename_rec (@$gv_dococr_json_filename_recs) {
-        my $gv_json_filename = $gv_json_filename_rec->{'filename'};
-        if (-M $gv_json_filename > -M $cached_openannotation_json_ofilename) {
-        $needs_json_regen = 1;
-        last;
-        }
-    }
-    }
-
-    my $saved_ok = 1;
-    
-    if ($needs_json_regen) {
-
-    print $outhandle "  OpenAnnotation-List: Generating $cached_openannotation_json_ofilename\n";
-    
-    $self->start_openannotation_list($doc_obj);
-
-    for my $gv_json_filename_rec (@$gv_dococr_json_filename_recs) {
-        my $gv_json_filename = $gv_json_filename_rec->{'filename'};
-        my $section = $gv_json_filename_rec->{'section'};
-        $self->convert_and_append_openannotation_resources($gv_json_filename, $doc_obj,$section);
-    }
-    
-    $saved_ok = $self->end_openannotation_list($doc_obj,$cached_openannotation_json_ofilename);
-    }
-    
-    if ($saved_ok) {
-    print $outhandle "  OpenAnnotation-List: Cached file $cached_openannotation_json_ofilename already exists\n";
-    
-    my $top_section = $doc_obj->get_top_section();
-    $doc_obj->associate_file($cached_openannotation_json_ofilename,$assoc_openannotation_json_ofile,"application/json",$top_section);
-    }
-
-    return $saved_ok;
-}
-
-
 sub opt_run_gen_openannotation
 {