Project

General

Profile

« Previous | Next » 

Revision 34448

Added by Alessia Bardi over 9 years ago

Query criteria as Map<String,Object> in order to support the query to get the stats report for the stats ui.

View differences:

modules/dnet-mongo-logging/trunk/src/main/java/eu/dnetlib/common/logging/dao/DnetLoggerMongoDao.java
31 31 
	@Override
32 32 
	public void configureIndex(final String collection, final Map<String, IndexConf> conf) {
33 33 
		final DBCollection coll = db.getCollection(collection);
34 
		coll.resetIndexCache();
34 
		coll.dropIndexes();
35 35 

  		




  36
  36
  
    
		for (String key : conf.keySet()) {


  		




  37
  
  
    
			coll.ensureIndex(key);


  		




  
  37
  
    
			coll.createIndex(new BasicDBObject(key, 1));


  		




  38
  38
  
    
		}


  		




  39
  39
  
    
	}


  		




  40
  40
  
    

  		




  ......




  80
  80
  
    
	}


  		




  81
  81
  
    

  		




  82
  82
  
    
	@Override


  		




  83
  
  
    
	public Iterator<Map<String, String>> find(final String collection, final Map<String, String> criteria) {


  		




  
  83
  
    
	public Iterator<Map<String, String>> find(final String collection, final Map<String, Object> criteria) {


  		




  84
  84
  
    
		final DBCollection coll = db.getCollection(collection);


  		




  85
  85
  
    
		return iter(collection, coll.find(new BasicDBObject(criteria)));


  		




  86
  86
  
    
	}


  		




  ......




  103
  103
  
    
	}


  		




  104
  104
  
    

  		




  105
  105
  
    
	@Override


  		




  106
  
  
    
	public Iterator<Map<String, String>> findByDateRange(final String collection, final Date startDate, final Date endDate, final Map<String, String> criteria) {


  		




  
  106
  
    
	public Iterator<Map<String, String>> findByDateRange(final String collection, final Date startDate, final Date endDate, final Map<String, Object> criteria) {


  		




  107
  107
  
    
		final DBCollection coll = db.getCollection(collection);


  		




  108
  108
  
    
		final DBObject dateQuery = dateRangeQuery(startDate, endDate);


  		




  109
  109
  
    
		final BasicDBObject customQuery = new BasicDBObject(criteria);


  		












  

    
      modules/dnet-modular-logging/trunk/src/main/java/eu/dnetlib/common/logging/dao/DnetLoggerDao.java
    
  





  18
  18
  
    

  		




  19
  19
  
    
	Iterator<Map<String, String>> find(final String collection, final String key, final String value);


  		




  20
  20
  
    

  		




  21
  
  
    
	Iterator<Map<String, String>> find(final String collection, final Map<String, String> criteria);


  		




  
  21
  
    
	Iterator<Map<String, String>> find(final String collection, final Map<String, Object> criteria);


  		




  22
  22
  
    

  		




  23
  23
  
    
	Iterator<Map<String, String>> findByDateRange(final String collection, final Date startDate, final Date endDate, final String key, final String value);


  		




  24
  24
  
    

  		




  25
  25
  
    
	Iterator<Map<String, String>> findByDateRange(final String collection, final Date startDate, final Date endDate);


  		




  26
  26
  
    

  		




  27
  
  
    
	Iterator<Map<String, String>> findByDateRange(final String name, final Date startDate, final Date endDate, final Map<String, String> criteria);


  		




  
  27
  
    
	Iterator<Map<String, String>> findByDateRange(final String name, final Date startDate, final Date endDate, final Map<String, Object> criteria);


  		




  28
  28
  
    

  		




  29
  29
  
    
}


  		












  

    
      modules/dnet-modular-logging/trunk/src/main/java/eu/dnetlib/common/logging/DnetLogger.java
    
  





  39
  39
  
    
		return dao.find(name, key, value);


  		




  40
  40
  
    
	}


  		




  41
  41
  
    

  		




  42
  
  
    
	public Iterator<Map<String, String>> find(final Map<String, String> criteria) {


  		




  
  42
  
    
	public Iterator<Map<String, String>> find(final Map<String, Object> criteria) {


  		




  43
  43
  
    
		return dao.find(name, criteria);


  		




  44
  44
  
    
	}


  		




  45
  45
  
    

  		




  ......




  77
  77
  
    
		return dao.findByDateRange(name, startDate, endDate, key, value);


  		




  78
  78
  
    
	}


  		




  79
  79
  
    

  		




  80
  
  
    
	public Iterator<Map<String, String>> range(final Date startDate, final Date endDate, final Map<String, String> criteria) {


  		




  
  80
  
    
	public Iterator<Map<String, String>> range(final Date startDate, final Date endDate, final Map<String, Object> criteria) {


  		




  81
  81
  
    
		return dao.findByDateRange(name, startDate, endDate, criteria);


  		




  82
  82
  
    
	}


  		




  83
  83
  
    

  		












Also available in:  Unified diff