Changeset 37207
- Timestamp:
- 2023-01-29T17:24:20+13:00 (14 months ago)
- Location:
- main/trunk/greenstone2/perllib/cgiactions
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm
r33311 r37207 29 29 30 30 use cgiactions::baseaction; 31 use cgiactions::metadataactioncommon; 31 32 32 33 use dbutil; … … 34 35 35 36 use JSON; 37 38 # convenient to have shorter version around 39 my $FLDV_HISTORY_DIR = $metadataactioncommon::FLDV_HISTORY_DIR; 36 40 37 41 # This class is conditionally expanded with set-metadata, remove-metadata and insert-metadata subroutines … … 69 73 # unused and untested 70 74 # 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" ] }, 75 80 76 81 #GET METHODS … … 81 86 "get-archives-metadata" => { 82 87 'compulsory-args' => [ "d", "metaname" ], 83 'optional-args' => [ " metapos" ] },88 'optional-args' => [ "dv", "metapos" ] }, 84 89 85 90 "get-index-metadata" => { … … 152 157 my $collect = $self->{'collect'}; 153 158 my $gsdl_cgi = $self->{'gsdl_cgi'}; 154 my $gsdlhome = $self->{'gsdlhome'};159 #my $gsdlhome = $self->{'gsdlhome'}; 155 160 my $infodbtype = $self->{'infodbtype'}; 156 161 157 162 # live metadata gets/saves value scoped (prefixed) by the current usename 158 163 # so (for now) let's not bother to enforce authentication 159 164 160 165 # Obtain the collect dir 161 162 166 my $site = $self->{'site'}; 167 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 163 168 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 164 169 … … 398 403 my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid); 399 404 # 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); 402 417 403 418 if($first_rec) { … … 688 703 my $collect = $self->{'collect'}; 689 704 my $gsdl_cgi = $self->{'gsdl_cgi'}; 690 my $gsdlhome = $self->{'gsdlhome'};705 #my $gsdlhome = $self->{'gsdlhome'}; 691 706 692 707 # Obtain the collect dir … … 736 751 my $collect = $self->{'collect'}; 737 752 my $gsdl_cgi = $self->{'gsdl_cgi'}; 738 my $gsdlhome = $self->{'gsdlhome'};753 #my $gsdlhome = $self->{'gsdlhome'}; 739 754 740 755 # Obtain the collect dir … … 873 888 my $collect = $self->{'collect'}; 874 889 my $gsdl_cgi = $self->{'gsdl_cgi'}; 875 # my $gsdlhome = $self->{'gsdlhome'};876 890 my $infodbtype = $self->{'infodbtype'}; 877 891 … … 894 908 895 909 # 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)); 899 924 900 925 } … … 908 933 my $collect = $self->{'collect'}; 909 934 my $gsdl_cgi = $self->{'gsdl_cgi'}; 910 # my $gsdlhome = $self->{'gsdlhome'};911 935 my $infodbtype = $self->{'infodbtype'}; 912 936 … … 925 949 926 950 # 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 929 964 my $metaname = undef; 930 965 my $metapos = -1; 931 966 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)); 933 968 934 969 } -
main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm
r33183 r37207 37 37 38 38 use cgiactions::baseaction; 39 use cgiactions::metadataactioncommon; 39 40 40 41 use dbutil; … … 43 44 use JSON; 44 45 46 # convenient to have shorter version around 47 my $FLDV_HISTORY_DIR = $metadataactioncommon::FLDV_HISTORY_DIR; 45 48 46 49 $metadataaction::modmeta_action_table = #OR: our $modmeta_action_table = … … 53 56 "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 54 57 'compulsory-args' => [ "metaname", "metavalue" ], 55 'optional-args' => [ "where", "metapos", "metamode", "prevmetavalue", "d", " f" ] },58 'optional-args' => [ "where", "metapos", "metamode", "prevmetavalue", "d", "dv", "f" ] }, 56 59 57 60 "set-index-metadata" => { … … 61 64 "set-archives-metadata" => { 62 65 '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 65 72 "set-import-metadata" => { 66 73 'compulsory-args' => [ "metaname", "metavalue" ], … … 106 113 "remove-archives-metadata" => { 107 114 'compulsory-args' => [ "d", "metaname" ], #TODO: add f argument 108 'optional-args' => [ " metapos", "metavalue", "metamode" ] },115 'optional-args' => [ "dv", "metapos", "metavalue", "metamode" ] }, 109 116 110 117 "remove-live-metadata" => { … … 118 125 "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 119 126 '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 param127 '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 121 128 122 129 … … 126 133 127 134 "erase-archives-metadata" => { 128 'compulsory-args' => [ "d", "metaname" ] }, 135 'compulsory-args' => [ "d", "metaname" ], 136 'optional-args' => [ "dv" ] }, 129 137 130 138 "erase-index-metadata" => { … … 145 153 }; 146 154 147 148 155 sub _set_live_metadata 149 156 { … … 152 159 my $collect = $self->{'collect'}; 153 160 my $gsdl_cgi = $self->{'gsdl_cgi'}; 154 #my $gsdlhome = $self->{'gsdlhome'};155 161 my $infodbtype = $self->{'infodbtype'}; 156 162 … … 158 164 my $site = $self->{'site'}; 159 165 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 160 ##my $collect_dir = &util::filename_cat($gsdlhome, "collect");161 166 162 167 … … 291 296 my $gsdl_cgi = $self->{'gsdl_cgi'}; 292 297 my $infodbtype = $self->{'infodbtype'}; 293 # my $gsdlhome = $self->{'gsdlhome'};294 298 295 299 # Obtain the collect and archive dir 296 300 my $site = $self->{'site'}; 297 301 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 298 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");299 302 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 300 303 … … 365 368 # look up additional args 366 369 my $docid = $self->{'d'}; 370 my $dv = $self->{'dv'}; 371 367 372 my $metaname = $self->{'metaname'}; 368 373 my $metavalue = $self->{'metavalue'}; … … 382 387 } 383 388 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); 386 391 387 392 if ($status == 0) { … … 420 425 my $gsdl_cgi = $self->{'gsdl_cgi'}; 421 426 427 # Obtain the collect dir 422 428 my $site = $self->{'site'}; 423 429 my $collect_dir = $gsdl_cgi->get_collection_dir($site); … … 468 474 my $collect = $self->{'collect'}; 469 475 my $gsdl_cgi = $self->{'gsdl_cgi'}; 470 #my $gsdlhome = $self->{'gsdlhome'};471 476 472 477 if ($baseaction::authentication_enabled) { … … 475 480 } 476 481 482 # Obtain the collect dir 477 483 my $site = $self->{'site'}; 478 484 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 479 485 480 486 $gsdl_cgi->checked_chdir($collect_dir); 481 482 # Obtain the collect dir483 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");484 487 485 488 # Make sure the collection isn't locked by someone else … … 621 624 my $collect = $self->{'collect'}; 622 625 my $gsdl_cgi = $self->{'gsdl_cgi'}; 626 627 # Obtain the collect dir 623 628 my $site = $self->{'site'}; 624 629 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 625 626 630 627 631 # look up additional args … … 699 703 my $collect = $self->{'collect'}; 700 704 my $gsdl_cgi = $self->{'gsdl_cgi'}; 701 # my $gsdlhome = $self->{'gsdlhome'};702 705 703 706 if ($baseaction::authentication_enabled) { … … 706 709 } 707 710 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); 710 714 711 715 $gsdl_cgi->checked_chdir($collect_dir); 712 716 713 # Obtain the collect dir714 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");715 717 716 718 # Make sure the collection isn't locked by someone else … … 731 733 my $gsdl_cgi = $self->{'gsdl_cgi'}; 732 734 735 # Obtain the collect dir 733 736 my $site = $self->{'site'}; 734 737 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 735 736 738 737 739 # look up additional args … … 819 821 } 820 822 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); 823 826 824 827 $gsdl_cgi->checked_chdir($collect_dir); … … 1110 1113 { 1111 1114 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) = @_; 1113 1116 1114 1117 my $info_mess = <<RAWEND; … … 1140 1143 my $doc_xml_file = $doc_rec->{'doc-file'}->[0]; 1141 1144 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 1142 1153 # 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 1144 1156 my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file); 1145 1157 … … 1162 1174 $metaname,$metavalue,$metapos,$metamode,$docid_secnum,$prevmetavalue); 1163 1175 1164 1165 1176 # return 0; # return 0 for now to indicate no error 1177 return (defined $self->{'error_msg'}) ? 1 : 0; 1166 1178 } 1167 1179 … … 1195 1207 my $collect = $self->{'collect'}; 1196 1208 my $gsdl_cgi = $self->{'gsdl_cgi'}; 1209 1210 # Obtain the collect dir 1197 1211 my $site = $self->{'site'}; 1198 1212 my $collect_dir = $gsdl_cgi->get_collection_dir($site); … … 1216 1230 my $status = -1; 1217 1231 my $docid = $doc_array_rec->{'docid'}; 1218 1232 my $dv = $doc_array_rec->{'dv'}; 1233 1219 1234 push(@all_docids,$docid); 1220 1235 … … 1235 1250 } 1236 1251 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); 1239 1254 } elsif (defined $doc_array_rec->{'metatable'}) { # if no metaname, we expect a metatable 1240 1255 my $metatable = $doc_array_rec->{'metatable'}; # a subarray, or need to generate an error saying JSON structure is wrong … … 1249 1264 foreach my $metavalue ( @$metavals ) { 1250 1265 $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); 1252 1267 1253 1268 if($metamode eq "override") { # now, having overridden the metavalue for the first, … … 1287 1302 my $collect = $self->{'collect'}; 1288 1303 my $gsdl_cgi = $self->{'gsdl_cgi'}; 1289 # my $gsdlhome = $self->{'gsdlhome'};1290 1304 1291 1305 if ($baseaction::authentication_enabled) { … … 1294 1308 } 1295 1309 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); 1298 1313 1299 1314 $gsdl_cgi->checked_chdir($collect_dir); 1300 1301 # Obtain the collect dir1302 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");1303 1315 1304 1316 # Make sure the collection isn't locked by someone else … … 1317 1329 my $collect = $self->{'collect'}; 1318 1330 my $gsdl_cgi = $self->{'gsdl_cgi'}; 1319 # my $gsdlhome = $self->{'gsdlhome'};1320 1331 my $infodbtype = $self->{'infodbtype'}; 1321 1332 1322 my $site = $self->{'site'}; 1323 1333 1324 1334 # 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); 1326 1337 1327 1338 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); … … 1354 1365 1355 1366 # 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); 1360 1382 1361 1383 if ($status == 0) … … 1835 1857 my $collect = $self->{'collect'}; 1836 1858 my $gsdl_cgi = $self->{'gsdl_cgi'}; 1837 # my $gsdlhome = $self->{'gsdlhome'};1838 1859 1839 1860 if ($baseaction::authentication_enabled) { … … 1842 1863 } 1843 1864 1865 # Obtain the collect dir 1844 1866 my $site = $self->{'site'}; 1845 1867 my $collect_dir = $gsdl_cgi->get_collection_dir($site); … … 1865 1887 my $gsdl_cgi = $self->{'gsdl_cgi'}; 1866 1888 1889 # Obtain the collect dir 1867 1890 my $site = $self->{'site'}; 1868 1891 my $collect_dir = $gsdl_cgi->get_collection_dir($site); … … 2044 2067 my $collect = $self->{'collect'}; 2045 2068 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2046 # my $gsdlhome = $self->{'gsdlhome'};2047 2069 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 2051 2072 my $site = $self->{'site'}; 2052 2073 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 2053 2074 2054 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");2055 2075 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 2056 2076 … … 2243 2263 my $collect = $self->{'collect'}; 2244 2264 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2245 # my $gsdlhome = $self->{'gsdlhome'};2246 2265 my $infodbtype = $self->{'infodbtype'}; 2247 2266 2248 2267 # Obtain the collect dir 2249 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");2250 2268 my $site = $self->{'site'}; 2251 2269 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 2252 2270 2253 2254 2271 # look up additional args 2255 2272 my $docid = $self->{'d'}; … … 2296 2313 my $collect = $self->{'collect'}; 2297 2314 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2298 my $gsdlhome = $self->{'gsdlhome'};2299 2315 2300 2316 if ($baseaction::authentication_enabled) { … … 2356 2372 my $collect = $self->{'collect'}; 2357 2373 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2358 # my $gsdlhome = $self->{'gsdlhome'};2359 2374 my $infodbtype = $self->{'infodbtype'}; 2360 2375 … … 2362 2377 my $site = $self->{'site'}; 2363 2378 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 2364 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");2365 2379 2366 2380 # look up additional args … … 2449 2463 my $collect = $self->{'collect'}; 2450 2464 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2451 # my $gsdlhome = $self->{'gsdlhome'};2452 2465 2453 2466 if ($baseaction::authentication_enabled) { … … 2457 2470 2458 2471 # 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); 2462 2474 2463 2475 # Make sure the collection isn't locked by someone else … … 2520 2532 my $collect = $self->{'collect'}; 2521 2533 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2522 # my $gsdlhome = $self->{'gsdlhome'};2523 2534 my $infodbtype = $self->{'infodbtype'}; 2524 2535 … … 2526 2537 my $site = $self->{'site'}; 2527 2538 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 2531 2541 my $docid = $self->{'d'}; 2532 2542 if ((!defined $docid) || ($docid =~ m/^\s*$/)) { … … 2588 2598 my $collect = $self->{'collect'}; 2589 2599 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2590 # my $gsdlhome = $self->{'gsdlhome'};2591 2600 2592 2601 if ($baseaction::authentication_enabled) { … … 2596 2605 2597 2606 # 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); 2601 2609 2602 2610 # Make sure the collection isn't locked by someone else … … 2617 2625 my $collect = $self->{'collect'}; 2618 2626 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2619 # my $gsdlhome = $self->{'gsdlhome'};2620 2627 my $infodbtype = $self->{'infodbtype'}; 2621 2628 2629 # Obtain the collect and archive dir 2622 2630 my $site = $self->{'site'}; 2623 2624 # Obtain the collect and archive dir2625 2631 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 2626 2632 … … 2641 2647 2642 2648 # 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); 2646 2663 2647 2664 if ($status == 0) … … 2694 2711 my $collect = $self->{'collect'}; 2695 2712 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2696 # my $gsdlhome = $self->{'gsdlhome'};2697 2713 my $infodbtype = $self->{'infodbtype'}; 2698 2714 2699 2715 # Obtain the collect dir 2700 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");2701 2716 my $site = $self->{'site'}; 2702 2717 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 2703 2718 2704 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");2705 2719 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 2706 2720 … … 2792 2806 my $collect = $self->{'collect'}; 2793 2807 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2794 my $gsdlhome = $self->{'gsdlhome'};2795 2808 2796 2809 if ($baseaction::authentication_enabled) { … … 2818 2831 my $collect = $self->{'collect'}; 2819 2832 my $gsdl_cgi = $self->{'gsdl_cgi'}; 2820 my $gsdlhome = $self->{'gsdlhome'};2821 2833 my $infodbtype = $self->{'infodbtype'}; 2822 2834 … … 2832 2844 2833 2845 # 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); 2837 2848 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 2838 2849
Note:
See TracChangeset
for help on using the changeset viewer.