Changeset 2599


Ignore:
Timestamp:
02/20/13 16:18:41 (11 years ago)
Author:
yana
Message:

logger messages organized in one line for better 'grep'ing

Location:
SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

    r2527 r2599  
    182182        String contextJson = null;
    183183
     184        String[] paramsReceived = new String[4];
     185
    184186        paramValue = Executions.getCurrent().getParameterMap().get("query");
    185187        if (paramValue != null) {
    186188            searchString.setValue(paramValue[0].trim());
    187             logger.log(Level.INFO, "Received parameter: query[{0}]",  searchString.getValue());
     189            paramsReceived[0] = searchString.getValue();
    188190        }
    189191        paramValue = Executions.getCurrent().getParameterMap().get("operation");
    190192        if (paramValue != null) {
    191193            String operationString = paramValue[0].trim();
    192             logger.log(Level.INFO, "Received parameter: operation[{0}]", operationString);
     194            paramsReceived[1] = operationString;
    193195            if (!operationString.equals("searchRetrieve")) {
    194                 logger.log(Level.SEVERE, "Not supported operation: {0}", operationString);
    195                 Messagebox.show("CLARIN-D Federated Content Search Aggregator\n\nVersion 0.0.1", "FCS", 0, Messagebox.INFORMATION);
     196                Messagebox.show("Not supported operation " + operationString, "FCS", 0, Messagebox.INFORMATION);
    196197            }
    197198        }
    … …  
    199200        if (paramValue != null) {
    200201            String versionString = paramValue[0].trim();
    201             logger.log(Level.INFO, "Received parameter: version[{0}]", versionString);
     202            paramsReceived[2] = versionString;
    202203            if (versionString.equals("1.2")) {
    203204                version = SRUVersion.VERSION_1_2;
    … …  
    205206                version = SRUVersion.VERSION_1_1;
    206207            } else {
    207                 logger.log(Level.SEVERE, "Not supported SRU version: {0}", versionString);
    208208                Messagebox.show("SRU Version " + version + " not supported", "FCS", 0, Messagebox.INFORMATION);
    209209            }
    … …  
    212212        if (paramValue != null) {
    213213            contextJson = paramValue[0].trim();
    214             logger.log(Level.INFO, "Received parameter: x-aggregation-context[{0}]", contextJson);
    215         }
     214            paramsReceived[3] = contextJson;
     215        }
     216        logger.log(Level.INFO, "Received parameters: query[{0}], operation[{1}], version[{2}], x-aggregation-context[{3}], ",  paramsReceived);
     217       
     218       
    216219
    217220        if (contextJson != null) {
    … …  
    222225            this.xAggregationContext = gson.fromJson(contextJson, mapType);
    223226            } catch (Exception ex) {
    224                 logger.log(Level.SEVERE, "Error parsing JSON from x-aggregation-context:\n {0}\n {1}", new String[]{ex.getMessage(), contextJson});
     227                logger.log(Level.SEVERE, "Error parsing JSON from x-aggregation-context: {0} {1}", new String[]{ex.getMessage(), contextJson});
    225228                Messagebox.show("Error in x-aggregation-context parameter", "FCS", 0, Messagebox.INFORMATION);
    226229            }

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/Corpus.java

    r2527 r2599  
    136136            corporaResponse = sruClient.scan(corporaRequest);
    137137        } catch (SRUClientException ex) {
    138             logger.log(Level.SEVERE, "Error accessing corpora {0} at {1}\n {2} {3}",
     138            logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
    139139                    new String[]{value, endpoint.getUrl(), ex.getClass().getName(), ex.getMessage()});
    140140        }

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/Endpoint.java

    r2527 r2599  
    9696            corporaResponse = sruClient.scan(corporaRequest);
    9797        } catch (SRUClientException ex) {
    98             logger.log(Level.SEVERE, "Error accessing corpora at {0}\n {1}\n {2}", new String[]{url, ex.getClass().getName(), ex.getMessage()});
     98            logger.log(Level.SEVERE, "Error accessing corpora at {0} {1} {2}", new String[]{url, ex.getClass().getName(), ex.getMessage()});
    9999        }
    100100        if (corporaResponse != null && corporaResponse.hasTerms()) {

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/Institution.java

    r2527 r2599  
    7272            }
    7373        } catch (Exception ex) {
    74             logger.log(Level.SEVERE, "Error accessing endpoint of {0}\n {1}\n {2}",
     74            logger.log(Level.SEVERE, "Error accessing endpoint of {0} {1} {2}",
    7575                    new String[]{link, ex.getClass().getName(), ex.getMessage()});
    7676        } finally {

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/SearchResult.java

    r2527 r2599  
    9595            }
    9696        } catch (Exception ex) {
    97             logger.log(Level.SEVERE, "Error consuming response from {0} {1}\n {2}\n {3}",
     97            logger.log(Level.SEVERE, "Error consuming response from {0} {1} {2} {3}",
    9898                    new Object[]{endpoint.getUrl(), corpus, ex.getClass().getName(), ex.getMessage()});
    9999        }

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResultsController.java

    r2527 r2599  
    133133            resultsItem.setFutureResponse(futureResponse);
    134134        } catch (SRUClientException ex) {
    135             logger.log(Level.SEVERE, "SearchRetrieve failed for {0}\n {1}\n {2}",
     135            logger.log(Level.SEVERE, "SearchRetrieve failed for {0} {1} {2}",
    136136                    new String[]{resultsItem.getEndpoint().getUrl(), ex.getClass().getName(), ex.getMessage()});
    137137        }
    … …  
    378378                Filedownload.save(os.toByteArray(), "text/tcf+xml", "ClarinDFederatedContentSearch.xml");
    379379            } catch (WLFormatException ex) {
    380                 logger.log(Level.SEVERE, "Error exporting TCF {0}\n {1}", new String[]{ex.getClass().getName(), ex.getMessage()});
     380                logger.log(Level.SEVERE, "Error exporting TCF {0} {1}", new String[]{ex.getClass().getName(), ex.getMessage()});
    381381                Messagebox.show("Sorry, export error!");
    382382            }
Note: See TracChangeset for help on using the changeset viewer.