Changeset 3207 for trunk/protemix/src


Ignore:
Timestamp:
2002-07-03T12:57:49+12:00 (20 years ago)
Author:
sjboddie
Message:

* empty log message *

Location:
trunk/protemix/src/recpt
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/protemix/src/recpt/browsetools.cpp

    r3186 r3207  
    4444
    4545  if (!response.docInfo[0].metadata["pdf"].values[0].empty()) {
    46     textout << outconvert << disp
    47         << "_document:imagepagepdf_"
    48         << "_document:imagearticlepdf_";
    49   }
     46    textout << outconvert << disp << "_document:imagepagepdf_";
     47  }
     48
     49  text_t top;
     50  get_top (args["d"], top);
     51  if (!get_info (top, args["c"], metadata, false, collectproto, response, logout)) return;
     52  if (!response.docInfo[0].metadata["pdf"].values[0].empty()) {
     53    textout << outconvert << disp << "_document:imagearticlepdf_";
     54  }
     55 
    5056  textout << outconvert << disp
    5157      << "_document:imagedetach_";
  • trunk/protemix/src/recpt/ptmxdocaction.cpp

    r3182 r3207  
    8787
    8888    // ------ for ptmx collection
    89 
    90     if (!args["c1"].empty() && args["c1"] != "Any") {
    91       //    formattedstring = "[" + args["c1"] + "]:CL";
    92       formattedstring = args["c1"];
    93     }
    94     if (!args["c2"].empty() && args["c2"] != "Any") {
    95       if (!formattedstring.empty()) formattedstring += " & ";
    96       //    formattedstring += "[" + args["c2"] + "]:CA";
    97       formattedstring += args["c2"];
    98     }
    99     if (!args["c3"].empty() && args["c3"] != "Any") {
    100       if (!formattedstring.empty()) formattedstring += " & ";
    101       //    formattedstring += "[" + args["c3"] + "]:CS";
    102       formattedstring += args["c3"];
    103     }
    104     if (!args["q"].empty()) {
    105       if (!formattedstring.empty()) formattedstring += " & ";
    106       formattedstring += args["q"];
    107     }
    10889
    10990    void insert_equiv_terms(text_t&); // declaration
  • trunk/protemix/src/recpt/ptmxqueryaction.cpp

    r3182 r3207  
    110110
    111111  if (!args["c1"].empty() && args["c1"] != "Any") {
    112     //    formattedstring = "[" + args["c1"] + "]:CL";
    113     formattedstring = args["c1"];
     112    formattedstring += "[" + args["c1"] + "]:CL";
    114113  }
    115114  if (!args["c2"].empty() && args["c2"] != "Any") {
    116115    if (!formattedstring.empty()) formattedstring += " & ";
    117     //    formattedstring += "[" + args["c2"] + "]:CA";
    118     formattedstring += args["c2"];
     116    formattedstring += "[" + args["c2"] + "]:CA";
    119117  }
    120118  if (!args["c3"].empty() && args["c3"] != "Any") {
     
    125123  if (!args["q"].empty()) {
    126124    if (!formattedstring.empty()) formattedstring += " & ";
    127     formattedstring += args["q"];
     125    // do synonym searching stuff
     126    text_t qstring = args["q"];
     127    int insert_equiv_terms(text_t&); // forward declaration
     128    insert_equiv_terms(qstring);
     129    formattedstring += qstring;
    128130  }
    129131
    130   // do synonym searching stuff
    131   int insert_equiv_terms(text_t&); // forward declaration
    132   insert_equiv_terms(formattedstring);
     132  outconvertclass text_t2ascii;
     133  logout << text_t2ascii << "formattedstring: " << formattedstring << "\n";
    133134
    134135  if (!formattedstring.empty()) {
Note: See TracChangeset for help on using the changeset viewer.