Changeset 17863

Show
Ignore:
Timestamp:
15.11.2008 15:01:04 (11 years ago)
Author:
anna
Message:

change the name tidy_html switch in HTMLPlug into use_realistic_book in HTMLPlugin

Location:
gsdl/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/HTMLPlugin.pm

    r17127 r17863  
    399399    # tidy the input file 
    400400    my $tidy_output_filename = $hdl_output_filename; 
    401     if ($self->{'tidy_html'}) 
     401    if ($self->{'use_realistic_book'}) 
    402402    { 
    403403        $tidy_output_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix"); 
     
    498498    $suffix = lc($suffix);    
    499499     
    500     if (($self->{'tidy_html'}) || ($self->{'old_style_HDL'})) 
     500    if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'})) 
    501501    { 
    502502    # because the document has to be sectionalized set the description tags  
  • gsdl/trunk/runtime-src/src/colservr/collectserver.cpp

    r16310 r17863  
    1  
     1  
    22/********************************************************************** 
    33 * 
     
    6060// configure should be called for each line in the 
    6161// configuration files to configure the collection server and everything 
    62 // it contains. The configuration should take place just before initialisationhttps://www.google.com/accounts/ServiceLogin?service=mail&passive=true&rm=false&continue=http%3A%2F%2Fmail.google.com%2Fmail%3Fui%3Dhtml%26zy%3Dl&ltmpl=ca_tlsosm_video&ltmplcache=2&hl=en. 
     62// it contains. The configuration should take place just before initialisation 
    6363void collectserver::configure (const text_t &key, const text_tarray &cfgline) { 
    6464  if (cfgline.size() >= 1) { 
     
    6969    const text_t &name = cfgline[0]; 
    7070     
    71     if (name == "HTMLPlug") 
     71    if (name == "HTMLPlugin") 
    7272    { 
    7373        for (int hI = 1; hI < cfgline.size(); hI++) 
     
    7575            const text_t &plugOption = cfgline[hI]; 
    7676             
    77             if (plugOption == "-tidy_html")  
     77            if (plugOption == "-use_realistic_book")  
    7878            { 
    7979                collectinfo.useBook = true; 
     
    166166      text_tmap params_map = collectinfo.collection_macros[meta_name]; 
    167167       
    168       if (cfgline.size() == 2) {// no params for this macrohttp://uk.sports.yahoo.com/13032007/13/news-brief.html 
     168      if (cfgline.size() == 2) {// no params for this macro 
    169169    params_map[g_EmptyText] = cfgline[1]; 
    170170      } 
  • gsdl/trunk/runtime-src/src/recpt/comproto.asn

    r220 r17863  
    216216  numDocs     [6] IMPLICIT INTEGER, 
    217217  numWords    [7] IMPLICIT INTEGER OPTIONAL, 
    218   numBytes    [8] IMPLICIT INTEGER OPTIONAL 
     218  numBytes    [8] IMPLICIT INTEGER OPTIONAL, 
     219  useBook     [9] IMPLICIT BOOLEAN     -- whether to use book mode 
    219220} 
    220221 
  • gsdl/trunk/runtime-src/src/recpt/statusaction.cpp

    r15589 r17863  
    579579          << "</td></tr>\n" 
    580580 
     581          << "<tr><th>use realistic book?</th><td>"; 
     582      if (collectinfo->useBook) textout << outconvert << "true"; 
     583      else textout << outconvert << "false"; 
     584      textout << outconvert  
     585          << "</td></tr>\n" 
     586           
    581587          << "<tr><th>build date</th><td>\"" 
    582588          << collectinfo->buildDate 
  • gsdl/trunk/runtime-src/src/z3950/z3950proto.cpp

    r15492 r17863  
    246246  // don't use beta field 
    247247  /*collectinfo.isBeta=false;*/ 
     248  collectinfo.useBook=false; 
    248249  collectinfo.buildDate=1; 
    249250  // leave ccsCols empty (no cross-coll. searching - for now)