Changeset 24225

Show
Ignore:
Timestamp:
04.07.2011 19:43:43 (8 years ago)
Author:
ak19
Message:

Still on ticket 449. Now srclink_file metadata (contains an underscore that makes things difficult for GS3) is renamed to srclinkFile. Related commits are in GS2's runtime-src formattools.cpp and dublincore.cpp and GS3's default/transform/config_format.xsl and Action.java.

Location:
main/trunk/greenstone2/perllib/plugins
Files:
11 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

    r24219 r24225  
    13661366     
    13671367    $doc_obj->associate_file($filename, $assocfilename, undef, $cursection); 
     1368    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    13681369    $doc_obj->add_utf8_metadata ($cursection, "srclink_file", $doc_obj->get_sourcefile()); 
     1370    $doc_obj->add_utf8_metadata ($cursection, "srclinkFile", $doc_obj->get_sourcefile()); 
    13691371} 
    13701372 
  • main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

    r24192 r24225  
    476476    $srclink_filename = $doc_obj->get_sourcefile(); 
    477477    } 
     478    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    478479    $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_");  
    479480    $doc_obj->add_utf8_metadata ($cursection, "srclink_file", $srclink_filename); 
     481    $doc_obj->add_utf8_metadata ($cursection, "srclinkFile", $srclink_filename); 
    480482    return 1; 
    481483} 
  • main/trunk/greenstone2/perllib/plugins/ConvertToRogPlugin.pm

    r24192 r24225  
    447447    $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection); 
    448448 
     449    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    449450    $doc_obj->add_metadata ($cursection, "srclink_file", "doc.$doc_ext");  
     451    $doc_obj->add_metadata ($cursection, "srclinkFile", "doc.$doc_ext");  
    450452    $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_");  
    451453 
  • main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

    r23757 r24225  
    258258    } 
    259259 
     260    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    260261    $doc_obj->add_metadata ($section, "srclink_file", $url_to_filename_no_path); 
    261     $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[srclink_file]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">"); 
     262    $doc_obj->add_metadata ($section, "srclinkFile", $url_to_filename_no_path); 
     263    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[srclinkFile]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">"); 
    262264 
    263265    # Add the image as an associated file 
  • main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

    r23353 r24225  
    138138        $doc_obj->associate_file($filename_full_path, $assoc_file, "", $section); 
    139139         
     140        # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    140141        $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile());  
     142        $doc_obj->add_metadata ($section, "srclinkFile", $doc_obj->get_sourcefile());  
    141143        # We don't know the size of the image, but the browser should display it at full size 
    142         $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\">"); 
     144        $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclinkFile]\">"); 
    143145         
    144146        # Add a fake thumbnail icon with the full-sized image scaled down by the browser 
    145         $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\" width=\"" . $self->{'thumbnailsize'} . "\">"); 
     147        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclinkFile]\" width=\"" . $self->{'thumbnailsize'} . "\">"); 
    146148    } 
    147149    #we have no text - adds dummy text and NoText metadata 
  • main/trunk/greenstone2/perllib/plugins/MP3Plugin.pm

    r23355 r24225  
    267267     
    268268    $doc_obj->add_metadata ($section, "srcicon", "_iconmp3_"); 
     269    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    269270    $doc_obj->add_metadata ($section, "srclink_file", $assoc_url); 
     271    $doc_obj->add_metadata ($section, "srclinkFile", $assoc_url); 
    270272    my $applet_metadata = $self->{'applet_metadata'}; 
    271273    if (defined $applet_metadata && $applet_metadata ) { 
  • main/trunk/greenstone2/perllib/plugins/MediainfoOGVPlugin.pm

    r22663 r24225  
    145145    $doc_obj->add_utf8_metadata ($section, $assoc_field, $doc_obj->get_source()); # Source metadata is already in utf8 
    146146 
     147    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    147148    $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile()); 
     149    $doc_obj->add_metadata ($section, "srclinkFile", $doc_obj->get_sourcefile()); 
    148150    $doc_obj->add_metadata ($section, "srcicon", "_iconogg_"); 
    149151 
  • main/trunk/greenstone2/perllib/plugins/OggVorbisPlugin.pm

    r22663 r24225  
    137137 
    138138    $doc_obj->add_metadata ($top_section, "FileFormat", "OggVorbis"); 
     139    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    139140    $doc_obj->add_metadata ($top_section, "srclink_file", $doc_obj->get_sourcefile()); 
     141    $doc_obj->add_metadata ($top_section, "srclinkFile", $doc_obj->get_sourcefile()); 
    140142    $doc_obj->add_metadata ($top_section, "srcicon", "_iconogg_"); 
    141143 
  • main/trunk/greenstone2/perllib/plugins/OpenDocumentPlugin.pm

    r23377 r24225  
    262262 
    263263    #setup to doclink thingi 
     264    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    264265    $doc_obj->add_metadata ("", "srclink_file", $doc_obj->get_sourcefile()); 
     266    $doc_obj->add_metadata ("", "srclinkFile", $doc_obj->get_sourcefile()); 
    265267    $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">");  
    266268 
  • main/trunk/greenstone2/perllib/plugins/RealMediaPlugin.pm

    r22663 r24225  
    108108    $doc_obj->add_metadata($top_section, "FileFormat", "RealMedia"); 
    109109 
     110    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    110111    $doc_obj->add_metadata ($top_section, "srclink_file", $doc_obj->get_sourcefile()); 
     112    $doc_obj->add_metadata ($top_section, "srclinkFile", $doc_obj->get_sourcefile()); 
    111113    $doc_obj->add_metadata($top_section, "srcicon", "_iconrmvideo_"); 
    112114 
  • main/trunk/greenstone2/perllib/plugins/UnknownPlugin.pm

    r22663 r24225  
    145145    $doc_obj->add_metadata ($section, "MimeType", $mime_type); 
    146146    $doc_obj->add_utf8_metadata ($section, $assoc_field, $doc_obj->get_source()); # Source metadata is already in utf8  
     147    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile 
    147148    $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile()); 
     149    $doc_obj->add_metadata ($section, "srclinkFile", $doc_obj->get_sourcefile()); 
    148150    $doc_obj->add_metadata ($section, "srcicon", "_".$self->{'srcicon'}."_"); 
    149151