Changeset 37207 for main


Ignore:
Timestamp:
2023-01-29T17:24:20+13:00 (15 months ago)
Author:
davidb
Message:

Support added in for optional cgi param 'dv' specifying the file-level document-version history (_fldv_history) folder to use

Location:
main/trunk/greenstone2/perllib/cgiactions
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

    r33311 r37207  
    2929
    3030use cgiactions::baseaction;
     31use cgiactions::metadataactioncommon;
    3132
    3233use dbutil;
    … …  
    3435
    3536use JSON;
     37
     38# convenient to have shorter version around
     39my $FLDV_HISTORY_DIR = $metadataactioncommon::FLDV_HISTORY_DIR;
    3640
    3741# This class is conditionally expanded with set-metadata, remove-metadata and insert-metadata subroutines
    … …  
    6973    # unused and untested
    7074    # when DocEdit=1, need to retrieve a doc's full text (or doc section's full text) from archives
    71     "get-archives-text" => {
    72     'compulsory-args' => [ "d" ] },
    73     #'compulsory-args' => [ "d" ],
    74     #'optional-args' => [ "section" ] },
     75        "get-archives-text" => {
     76            'compulsory-args' => [ "d" ],
     77            'optional-args'   => [ "dv" ] },
     78            #'compulsory-args' => [ "d" ],
     79            #'optional-args' => [ "section" ] },
    7580   
    7681    #GET METHODS
    … …  
    8186    "get-archives-metadata" => {
    8287        'compulsory-args' => [ "d", "metaname" ],
    83         'optional-args'   => [ "metapos" ] },
     88        'optional-args'   => [ "dv", "metapos" ] },
    8489   
    8590    "get-index-metadata" => {
    … …  
    152157    my $collect   = $self->{'collect'};
    153158    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    154     my $gsdlhome  = $self->{'gsdlhome'};
     159    #my $gsdlhome  = $self->{'gsdlhome'};
    155160    my $infodbtype = $self->{'infodbtype'};
    156161   
    157162    # live metadata gets/saves value scoped (prefixed) by the current usename
    158163    # so (for now) let's not bother to enforce authentication
    159 
     164   
    160165    # Obtain the collect dir
    161     my $site = $self->{'site'};
    162     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     166    my $site = $self->{'site'};
     167    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    163168    ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    164169
    … …  
    398403        my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid);
    399404        # This now stores the full pathname
    400         my $doc_filename = $doc_rec->{'doc-file'}->[0];
    401         $doc_filename = &util::filename_cat($archive_dir, $doc_filename);
     405        my $doc_file = $doc_rec->{'doc-file'}->[0];
     406
     407        # check if request if for file-level doc-version history 'nminus-<n>' version
     408        my $dv = $self->{'dv'};
     409        if (defined $dv && ($dv ne "")) {
     410        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
     411       
     412        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
     413        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
     414        }
     415       
     416        my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
    402417
    403418        if($first_rec) {
    … …  
    688703    my $collect   = $self->{'collect'};
    689704    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    690     my $gsdlhome  = $self->{'gsdlhome'};
     705    #my $gsdlhome  = $self->{'gsdlhome'};
    691706
    692707    # Obtain the collect dir
    … …  
    736751    my $collect   = $self->{'collect'};
    737752    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    738     my $gsdlhome  = $self->{'gsdlhome'};
     753    #my $gsdlhome  = $self->{'gsdlhome'};
    739754
    740755    # Obtain the collect dir
    … …  
    873888    my $collect   = $self->{'collect'};
    874889    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    875 #   my $gsdlhome  = $self->{'gsdlhome'};
    876890    my $infodbtype = $self->{'infodbtype'};
    877891
    … …  
    894908
    895909    # This now stores the full pathname
    896     my $doc_filename = $doc_rec->{'doc-file'}->[0];
    897 
    898     $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $docid_secnum));
     910    my $doc_file = $doc_rec->{'doc-file'}->[0];
     911
     912    # check if request if for file-level doc-version history 'nminus-<n>' version
     913    my $dv = $self->{'dv'};
     914    if (defined $dv && ($dv ne "")) {
     915        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
     916       
     917        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
     918        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
     919    }
     920
     921    my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
     922       
     923    $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, $docid_secnum));
    899924
    900925}
    … …  
    908933    my $collect   = $self->{'collect'};
    909934    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    910 #   my $gsdlhome  = $self->{'gsdlhome'};
    911935    my $infodbtype = $self->{'infodbtype'};
    912936
    … …  
    925949
    926950    # This now stores the full pathname
    927     my $doc_filename = $doc_rec->{'doc-file'}->[0];
    928    
     951    my $doc_file = $doc_rec->{'doc-file'}->[0];
     952
     953    # check if request if for file-level doc-version history 'nminus-<n>' version
     954    my $dv = $self->{'dv'};
     955    if (defined $dv && ($dv ne "")) {
     956        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
     957       
     958        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
     959        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
     960    }
     961   
     962    my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
     963       
    929964    my $metaname = undef;
    930965    my $metapos = -1;
    931966   
    932     $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $docid_secnum));
     967    $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, $docid_secnum));
    933968
    934969}

  • main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm

    r33183 r37207  
    3737
    3838use cgiactions::baseaction;
     39use cgiactions::metadataactioncommon;
    3940
    4041use dbutil;
    … …  
    4344use JSON;
    4445
     46# convenient to have shorter version around
     47my $FLDV_HISTORY_DIR = $metadataactioncommon::FLDV_HISTORY_DIR;
    4548
    4649$metadataaction::modmeta_action_table = #OR: our $modmeta_action_table =
    … …  
    5356    "set-metadata" => { # generic set-meta function. The 'where' param can be set to any combination of index|archives|import|live. docid d is still compulsory for setting index, archives and live meta
    5457        'compulsory-args' => [ "metaname", "metavalue" ],
    55         'optional-args'   => [ "where", "metapos", "metamode", "prevmetavalue", "d", "f" ] },
     58        'optional-args'   => [ "where", "metapos", "metamode", "prevmetavalue", "d", "dv", "f" ] },
    5659
    5760    "set-index-metadata" => {
    … …  
    6164    "set-archives-metadata" => {
    6265        'compulsory-args' => [ "d", "metaname", "metavalue" ],
    63         'optional-args'   => [ "metapos", "metamode", "prevmetavalue" ] }, # metamode can be "accumulate", "override",
    64    
     66        'optional-args'   => [ "dv", "metapos", "metamode", "prevmetavalue" ] }, # metamode can be "accumulate", "override",
     67
     68        ###### !!!!!
     69    # Should there not be a "set-archives-text" also ???!!!!??
     70    ###### !!!!!
     71       
    6572    "set-import-metadata" => {
    6673        'compulsory-args' => [ "metaname", "metavalue" ],
    … …  
    106113    "remove-archives-metadata" => {
    107114        'compulsory-args' => [ "d", "metaname" ], #TODO: add f argument
    108         'optional-args'   => [ "metapos", "metavalue", "metamode" ] },
     115        'optional-args'   => [ "dv", "metapos", "metavalue", "metamode" ] },
    109116
    110117    "remove-live-metadata" => {
    … …  
    118125    "remove-metadata" => { # generic remove-meta function. The 'where' param can be set to any combination of index|archives|import|live. docid d is still compulsory for setting index, archives and live meta
    119126        'compulsory-args' => [ "d", "metaname" ],
    120         'optional-args'   => [ "where", "metapos", "metavalue", "metamode" ] }, # metamode is optional since remove-metadata can call any of remove_import_meta and remove_archives_meta, remove_index_meta, of which the first two accept metamode as an optional param
     127        'optional-args'   => [ "where", "dv", "metapos", "metavalue", "metamode" ] }, # metamode is optional since remove-metadata can call any of remove_import_meta and remove_archives_meta, remove_index_meta, of which the first two accept metamode as an optional param
    121128
    122129
    … …  
    126133
    127134    "erase-archives-metadata" => {
    128         'compulsory-args' => [ "d", "metaname" ] },
     135        'compulsory-args' => [ "d", "metaname" ],
     136        'optional-args'   => [ "dv" ] },
    129137
    130138    "erase-index-metadata" => {
    … …  
    145153};
    146154
    147 
    148155sub _set_live_metadata
    149156{
    … …  
    152159    my $collect   = $self->{'collect'};
    153160    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    154     #my $gsdlhome  = $self->{'gsdlhome'};
    155161    my $infodbtype = $self->{'infodbtype'};
    156162
    … …  
    158164    my $site = $self->{'site'};
    159165    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    160     ##my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    161166
    162167
    … …  
    291296    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    292297    my $infodbtype = $self->{'infodbtype'};
    293 #    my $gsdlhome  = $self->{'gsdlhome'};
    294298     
    295299    # Obtain the collect and archive dir   
    296300    my $site = $self->{'site'};
    297301    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    298     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    299302    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
    300303   
    … …  
    365368    # look up additional args
    366369    my $docid  = $self->{'d'};
     370    my $dv     = $self->{'dv'};
     371   
    367372    my $metaname   = $self->{'metaname'};
    368373    my $metavalue  = $self->{'metavalue'};
    … …  
    382387    }
    383388
    384     my $status = $self->set_archives_metadata_entry($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,$docid,
    385                 $metaname,$metapos,$metavalue,$metamode,$prevmetavalue);
     389    my $status = $self->set_archives_metadata_entry($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,
     390                            $docid,$dv, $metaname,$metapos,$metavalue,$metamode,$prevmetavalue);
    386391   
    387392    if ($status == 0) {
    … …  
    420425    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    421426
     427    # Obtain the collect dir
    422428    my $site = $self->{'site'};
    423429    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    … …  
    468474    my $collect   = $self->{'collect'};
    469475    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    470     #my $gsdlhome  = $self->{'gsdlhome'};
    471476
    472477    if ($baseaction::authentication_enabled) {
    … …  
    475480    }
    476481
     482    # Obtain the collect dir
    477483    my $site = $self->{'site'};
    478484    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    479485   
    480486    $gsdl_cgi->checked_chdir($collect_dir);
    481 
    482     # Obtain the collect dir
    483     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    484487
    485488    # Make sure the collection isn't locked by someone else
    … …  
    621624    my $collect   = $self->{'collect'};
    622625    my $gsdl_cgi  = $self->{'gsdl_cgi'};
     626
     627    # Obtain the collect dir
    623628    my $site = $self->{'site'};
    624629    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    625 
    626630   
    627631    # look up additional args
    … …  
    699703    my $collect   = $self->{'collect'};
    700704    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    701 #    my $gsdlhome  = $self->{'gsdlhome'};
    702705
    703706    if ($baseaction::authentication_enabled) {
    … …  
    706709    }
    707710
    708     my $site = $self->{'site'};
    709     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     711    # Obtain the collect dir
     712    my $site = $self->{'site'};
     713    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    710714   
    711715    $gsdl_cgi->checked_chdir($collect_dir);
    712716
    713     # Obtain the collect dir
    714     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    715717
    716718    # Make sure the collection isn't locked by someone else
    … …  
    731733    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    732734
     735    # Obtain the collect dir
    733736    my $site = $self->{'site'};
    734737    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    735 
    736738   
    737739    # look up additional args
    … …  
    819821    }
    820822
    821     my $site = $self->{'site'};
    822     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     823    # Obtain the collect dir
     824    my $site = $self->{'site'};
     825    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    823826   
    824827    $gsdl_cgi->checked_chdir($collect_dir);
    … …  
    11101113{
    11111114    my $self = shift @_;
    1112     my ($gsdl_cgi, $archive_dir, $collect_dir, $collect, $infodbtype, $docid, $metaname, $metapos, $metavalue, $metamode, $prevmetavalue) = @_;
     1115    my ($gsdl_cgi, $archive_dir, $collect_dir, $collect, $infodbtype, $docid, $dv, $metaname, $metapos, $metavalue, $metamode, $prevmetavalue) = @_;
    11131116
    11141117    my $info_mess = <<RAWEND;
    … …  
    11401143    my $doc_xml_file = $doc_rec->{'doc-file'}->[0];
    11411144   
     1145    # check if request if for file-level doc-version history 'nminus-<n>' version
     1146    if (defined $dv && ($dv ne "")) {
     1147    # Need to insert '_fldv_history/nminus-<n>' into doc_filename
     1148   
     1149    my ($doc_xml_tailname, $doc_xml_dirname) = File::Basename::fileparse($doc_xml_file);
     1150    $doc_xml_file = &util::filename_cat($doc_xml_dirname,$FLDV_HISTORY_DIR,$dv,$doc_xml_tailname);
     1151    }
     1152   
    11421153    # The $doc_xml_file is relative to the archives, and now let's get the full path
    1143     my $archives_dir = &util::filename_cat($collect_dir,$collect,"archives");   
     1154    my $archives_dir = &util::filename_cat($collect_dir,$collect,"archives");
     1155
    11441156    my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file);
    11451157
    … …  
    11621174            $metaname,$metavalue,$metapos,$metamode,$docid_secnum,$prevmetavalue);
    11631175
    1164     # return 0; # return 0 for now to indicate no error
    1165     return (defined $self->{'error_msg'}) ? 1 : 0;
     1176    # return 0; # return 0 for now to indicate no error
     1177    return (defined $self->{'error_msg'}) ? 1 : 0;
    11661178}
    11671179
    … …  
    11951207    my $collect   = $self->{'collect'};
    11961208    my $gsdl_cgi  = $self->{'gsdl_cgi'};
     1209
     1210    # Obtain the collect dir
    11971211    my $site = $self->{'site'};
    11981212    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    … …  
    12161230    my $status    = -1;
    12171231    my $docid     = $doc_array_rec->{'docid'};
    1218 
     1232    my $dv        = $doc_array_rec->{'dv'};
     1233   
    12191234    push(@all_docids,$docid);
    12201235   
    … …  
    12351250        }       
    12361251       
    1237         $status = $self->set_archives_metadata_entry($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,$docid,
    1238                 $metaname,$metapos,$metavalue,$metamode,$prevmetavalue);
     1252        $status = $self->set_archives_metadata_entry($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,
     1253                             $docid,$dv, $metaname,$metapos,$metavalue,$metamode,$prevmetavalue);
    12391254    } elsif (defined $doc_array_rec->{'metatable'}) { # if no metaname, we expect a metatable
    12401255        my $metatable = $doc_array_rec->{'metatable'}; # a subarray, or need to generate an error saying JSON structure is wrong
    … …  
    12491264        foreach my $metavalue ( @$metavals ) {
    12501265            $status = $self->set_archives_metadata_entry($gsdl_cgi,$archive_dir, $collect_dir,$collect,$infodbtype,
    1251                                  $docid,$metaname,$metapos,$metavalue,$metamode,$prevmetavalue);
     1266                                 $docid,$dv, $metaname,$metapos,$metavalue,$metamode,$prevmetavalue);
    12521267           
    12531268            if($metamode eq "override") { # now, having overridden the metavalue for the first,
    … …  
    12871302    my $collect   = $self->{'collect'};
    12881303    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    1289 #    my $gsdlhome  = $self->{'gsdlhome'};
    12901304
    12911305    if ($baseaction::authentication_enabled) {
    … …  
    12941308    }
    12951309
    1296     my $site = $self->{'site'};
    1297     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     1310    # Obtain the collect dir
     1311    my $site = $self->{'site'};
     1312    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    12981313   
    12991314    $gsdl_cgi->checked_chdir($collect_dir);
    1300 
    1301     # Obtain the collect dir
    1302     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    13031315
    13041316    # Make sure the collection isn't locked by someone else
    … …  
    13171329    my $collect   = $self->{'collect'};
    13181330    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    1319 #   my $gsdlhome  = $self->{'gsdlhome'};
    13201331    my $infodbtype = $self->{'infodbtype'};
    13211332   
    1322     my $site = $self->{'site'};
    1323        
     1333
    13241334    # Obtain the collect and archive dir   
    1325     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     1335    my $site = $self->{'site'};     
     1336    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    13261337   
    13271338    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
    … …  
    13541365
    13551366    # This now stores the full pathname
    1356     my $doc_filename = $doc_rec->{'doc-file'}->[0];
    1357 
    1358     my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $metavalue, $docid_secnum, $metamode);
    1359 #   my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, undef, $docid_secnum);
     1367    my $doc_file = $doc_rec->{'doc-file'}->[0];
     1368
     1369    # check if request if for file-level doc-version history 'nminus-<n>' version
     1370    my $dv = $self->{'dv'};
     1371    if (defined $dv && ($dv ne "")) {
     1372        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
     1373       
     1374        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
     1375        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
     1376    }
     1377
     1378    my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
     1379       
     1380    my $status = $self->remove_from_doc_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, $metavalue, $docid_secnum, $metamode);
     1381#   my $status = $self->remove_from_doc_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, undef, $docid_secnum);
    13601382   
    13611383    if ($status == 0)
    … …  
    18351857    my $collect   = $self->{'collect'};
    18361858    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    1837 #    my $gsdlhome  = $self->{'gsdlhome'};
    18381859
    18391860    if ($baseaction::authentication_enabled) {
    … …  
    18421863    }
    18431864
     1865    # Obtain the collect dir
    18441866    my $site = $self->{'site'};
    18451867    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    … …  
    18651887    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    18661888
     1889    # Obtain the collect dir
    18671890    my $site = $self->{'site'};
    18681891    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    … …  
    20442067    my $collect   = $self->{'collect'};
    20452068    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2046 #   my $gsdlhome  = $self->{'gsdlhome'};
    20472069    my $infodbtype = $self->{'infodbtype'};
    2048    
    2049     # Obtain the collect dir
    2050     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
     2070
     2071    # Obtain the collect and archive dir
    20512072    my $site = $self->{'site'};
    20522073    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    20532074   
    2054     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    20552075    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
    20562076
    … …  
    22432263    my $collect   = $self->{'collect'};
    22442264    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2245 #    my $gsdlhome  = $self->{'gsdlhome'};
    22462265    my $infodbtype = $self->{'infodbtype'};
    22472266
    22482267    # Obtain the collect dir
    2249     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    22502268    my $site = $self->{'site'};
    22512269    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    22522270
    2253    
    22542271    # look up additional args
    22552272    my $docid     = $self->{'d'};
    … …  
    22962313    my $collect   = $self->{'collect'};
    22972314    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2298     my $gsdlhome  = $self->{'gsdlhome'};
    22992315   
    23002316    if ($baseaction::authentication_enabled) {
    … …  
    23562372    my $collect   = $self->{'collect'};
    23572373    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2358 #    my $gsdlhome  = $self->{'gsdlhome'};
    23592374    my $infodbtype = $self->{'infodbtype'};
    23602375   
    … …  
    23622377    my $site = $self->{'site'};
    23632378    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    2364     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    23652379
    23662380        # look up additional args
    … …  
    24492463    my $collect   = $self->{'collect'};
    24502464    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2451 #    my $gsdlhome  = $self->{'gsdlhome'};
    24522465   
    24532466    if ($baseaction::authentication_enabled) {
    … …  
    24572470
    24582471    # Obtain the collect dir
    2459     my $site = $self->{'site'};
    2460     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    2461     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
     2472    my $site = $self->{'site'};
     2473    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    24622474
    24632475    # Make sure the collection isn't locked by someone else
    … …  
    25202532    my $collect   = $self->{'collect'};
    25212533    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2522 #    my $gsdlhome  = $self->{'gsdlhome'};
    25232534    my $infodbtype = $self->{'infodbtype'};
    25242535   
    … …  
    25262537    my $site = $self->{'site'};
    25272538    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    2528     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    2529 
    2530         # look up additional args
     2539
     2540    # look up additional args
    25312541    my $docid     = $self->{'d'};
    25322542    if ((!defined $docid) || ($docid =~ m/^\s*$/)) {
    … …  
    25882598    my $collect   = $self->{'collect'};
    25892599    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2590 #    my $gsdlhome  = $self->{'gsdlhome'};
    25912600   
    25922601    if ($baseaction::authentication_enabled) {
    … …  
    25962605
    25972606    # Obtain the collect dir
    2598     my $site = $self->{'site'};
    2599     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    2600     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
     2607    my $site = $self->{'site'};
     2608    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    26012609
    26022610    # Make sure the collection isn't locked by someone else
    … …  
    26172625    my $collect   = $self->{'collect'};
    26182626    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2619 #   my $gsdlhome  = $self->{'gsdlhome'};
    26202627    my $infodbtype = $self->{'infodbtype'};
    2621    
     2628           
     2629    # Obtain the collect and archive dir   
    26222630    my $site = $self->{'site'};
    2623        
    2624     # Obtain the collect and archive dir   
    26252631    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    26262632   
    … …  
    26412647
    26422648    # This now stores the full pathname
    2643     my $doc_filename = $doc_rec->{'doc-file'}->[0];
    2644 
    2645     my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $metavalue, $docid_secnum, $metamode);
     2649    my $doc_file = $doc_rec->{'doc-file'}->[0];
     2650
     2651    # check if request if for file-level doc-version history 'nminus-<n>' version
     2652    my $dv = $self->{'dv'};
     2653    if (defined $dv && ($dv ne "")) {
     2654        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
     2655       
     2656        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
     2657        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
     2658    }
     2659
     2660    my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
     2661   
     2662    my $status = $self->remove_from_doc_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, $metavalue, $docid_secnum, $metamode);
    26462663   
    26472664    if ($status == 0)
    … …  
    26942711    my $collect   = $self->{'collect'};
    26952712    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2696 #   my $gsdlhome  = $self->{'gsdlhome'};
    26972713    my $infodbtype = $self->{'infodbtype'};
    26982714   
    26992715    # Obtain the collect dir
    2700     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    27012716    my $site = $self->{'site'};
    27022717    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    27032718   
    2704     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
    27052719    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
    27062720
    … …  
    27922806    my $collect   = $self->{'collect'};
    27932807    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2794     my $gsdlhome  = $self->{'gsdlhome'};
    27952808   
    27962809    if ($baseaction::authentication_enabled) {
    … …  
    28182831    my $collect   = $self->{'collect'};
    28192832    my $gsdl_cgi  = $self->{'gsdl_cgi'};
    2820     my $gsdlhome  = $self->{'gsdlhome'};
    28212833    my $infodbtype = $self->{'infodbtype'};
    28222834   
    … …  
    28322844
    28332845    # Obtain the collect and archive dir   
    2834     my $site = $self->{'site'};
    2835     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    2836     ##my $collect_dir = &util::filename_cat($gsdlhome, "collect");
     2846    my $site = $self->{'site'};
     2847    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
    28372848    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
    28382849
Note: See TracChangeset for help on using the changeset viewer.