Show
Ignore:
Timestamp:
20.10.2014 14:01:50 (5 years ago)
Author:
kjdon
Message:

removed the commented out args - these args are ones that collector uses. Added a couple of new args, for turning off cahcing of metadata values, and for local depositor - when we want a link from a collection to deposit. want to bypass the select a collection page.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp

    r28930 r29381  
    157157  argsinfo.addarginfo (NULL, arg_ainfo); 
    158158 
    159 //   arg_ainfo.shortname = "di1fullname"; 
    160 //   arg_ainfo.longname = "depositor specific"; 
    161 //   arg_ainfo.multiplechar = true; 
    162 //   arg_ainfo.multiplevalue = false; 
    163 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    164 //   arg_ainfo.argdefault = g_EmptyText; 
    165 //   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk 
    166 //   argsinfo.addarginfo (NULL, arg_ainfo); 
    167  
    168159  arg_ainfo.shortname = "di1dirname"; 
    169160  arg_ainfo.longname = "depositor specific"; 
     
    184175  argsinfo.addarginfo (NULL, arg_ainfo); 
    185176 
    186 //   arg_ainfo.shortname = "di1clone"; 
    187 //   arg_ainfo.longname = "depositor specific"; 
    188 //   arg_ainfo.multiplechar = false; 
    189 //   arg_ainfo.multiplevalue = false; 
    190 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    191 //   arg_ainfo.argdefault = "0"; 
    192 //   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk 
    193 //   argsinfo.addarginfo (NULL, arg_ainfo); 
    194  
    195 //   arg_ainfo.shortname = "di1clonecol"; 
    196 //   arg_ainfo.longname = "depositor specific"; 
    197 //   arg_ainfo.multiplechar = true; 
    198 //   arg_ainfo.multiplevalue = false; 
    199 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    200 //   arg_ainfo.argdefault = g_EmptyText; 
    201 //   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk 
    202 //   argsinfo.addarginfo (NULL, arg_ainfo); 
    203  
    204 //   arg_ainfo.shortname = "cfgfile"; 
    205 //   arg_ainfo.longname = "configuration file contents"; 
    206 //   arg_ainfo.multiplechar = true; 
    207 //   arg_ainfo.multiplevalue = false; 
    208 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    209 //   arg_ainfo.argdefault = g_EmptyText; 
    210 //   arg_ainfo.savedarginfo = cgiarginfo::mustnot; 
    211 //   argsinfo.addarginfo (NULL, arg_ainfo); 
    212  
    213 //   // will be set if we arrived at the "configure collection" page 
    214 //   // via the "changing an existing collection" page 
    215 //   arg_ainfo.shortname = "di1econf"; 
    216 //   arg_ainfo.longname = "depositor specific"; 
    217 //   arg_ainfo.multiplechar = false; 
    218 //   arg_ainfo.multiplevalue = false; 
    219 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    220 //   arg_ainfo.argdefault = "0"; 
    221 //   arg_ainfo.savedarginfo = cgiarginfo::must; 
    222 //   argsinfo.addarginfo (NULL, arg_ainfo); 
    223177 
    224178  // wizard uses this to see if we are working with an existing collection: 
     
    233187  argsinfo.addarginfo (NULL, arg_ainfo); 
    234188 
    235 //   arg_ainfo.shortname = "di1input"; 
    236 //   arg_ainfo.longname = "depositor specific"; 
    237 //   arg_ainfo.multiplechar = true; 
    238 //   arg_ainfo.multiplevalue = true; 
    239 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    240 //   arg_ainfo.argdefault = g_EmptyText; 
    241 //   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk 
    242 //   argsinfo.addarginfo (NULL, arg_ainfo); 
    243  
    244 //   //we don't need this in the depositor 
    245 //   arg_ainfo.shortname = "di1inputtype"; 
    246 //   arg_ainfo.longname = "depositor specific"; 
    247 //   arg_ainfo.multiplechar = true; 
    248 //   arg_ainfo.multiplevalue = true; 
    249 //   arg_ainfo.defaultstatus = cgiarginfo::weak; 
    250 //   arg_ainfo.argdefault = g_EmptyText; 
    251 //   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk 
    252 //   argsinfo.addarginfo (NULL, arg_ainfo); 
     189  // collection specific depositing. We are bypassing the select page. Need to do the clearing that happens at select. And depositor link at top right should be back to local deposit  
     190  arg_ainfo.shortname = "di1local"; 
     191  arg_ainfo.longname = "depositor specific"; 
     192  arg_ainfo.multiplechar = false; 
     193  arg_ainfo.multiplevalue = false; 
     194  arg_ainfo.defaultstatus = cgiarginfo::weak; 
     195  arg_ainfo.argdefault = "0"; 
     196  arg_ainfo.savedarginfo = cgiarginfo::must; 
     197  argsinfo.addarginfo (NULL, arg_ainfo); 
     198  
     199  // shall we cache the metadata values? Made this an arg so we can turn it off if wanted 
     200  arg_ainfo.shortname = "di1cache"; 
     201  arg_ainfo.longname = "depositor specific"; 
     202  arg_ainfo.multiplechar = false; 
     203  arg_ainfo.multiplevalue = false; 
     204  arg_ainfo.defaultstatus = cgiarginfo::weak; 
     205  arg_ainfo.argdefault = "1"; 
     206  arg_ainfo.savedarginfo = cgiarginfo::must; 
     207  argsinfo.addarginfo (NULL, arg_ainfo); 
    253208 
    254209} 
     
    320275  } 
    321276   
    322   if (current_page == "select") {   
     277  if (current_page == "select" || (current_page == "step1" && args["di1local"] == "1")) {   
    323278  
    324279    //make sure the last page arg is re-set to zero  
     
    390345 
    391346    // create cached metadata values 
     347    if (args["di1cache"] == "1") { 
    392348    text_t cached_metadata_values = ""; 
    393349    cgiargsclass::const_iterator args_here = args.begin(); 
     
    435391      cached_metadata_values += "\\});"; 
    436392      args["cachedMDValues"] = cached_metadata_values; 
     393    } 
    437394    } 
    438395  }