Show
Ignore:
Timestamp:
16.12.2010 00:14:16 (9 years ago)
Author:
davidb
Message:

Additionoal check added before printing out warning about a filter not being available/recognized.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

    r22050 r23492  
    452452    response.clear (); 
    453453    err = protocolError; 
    454     logout << text_t2ascii << "Protocol Error: filter options requested for non-existent\n" 
    455        << "filter \"" << request.filterName << "\".\n\n"; 
     454    text_t& infodbtype = collectinfo.infodbType; 
     455 
     456    // Don't print out the warning if were's asking about SQLQueryFilter  
     457    // when we know the infodbtype is something other than .*sql.* 
     458 
     459    if ((request.filterName != "SQLQueryFilter")  
     460    || (findword(infodbtype.begin(),infodbtype.end(),"sql") != infodbtype.end())) { 
     461      logout << text_t2ascii << "Protocol Error: filter options requested for non-existent\n" 
     462         << "filter \"" << request.filterName << "\".\n\n"; 
     463    } 
    456464  } 
    457465}