Merge pull request #105 in ASAPO/asapo from fix_query to develop

* commit '9d910baa':
  fix query images

broker/src/asapo_broker/database/mongodb_query.go

@@ -198,7 +198,7 @@ func getSortBSONFromOrderArray(order_array sqlparser.OrderBy) (bson.M, error) {
 }
 
 func (db *Mongodb) BSONFromSQL(dbname string, query string) (bson.M, bson.M, error) {
-	stmt, err := sqlparser.Parse("select * from " + dbname + " where " + query)
+	stmt, err := sqlparser.Parse("select * from whatever where " + query)
 	if err != nil {
 		return bson.M{}, bson.M{}, err
 	}

broker/src/asapo_broker/database/mongodb_test.go

@@ -24,7 +24,7 @@ type TestDataset struct {
 
 var db Mongodb
 
-const dbname = "run1"
+const dbname = "12345"
 const collection = "substream"
 const collection2 = "substream2"
 const dbaddress = "127.0.0.1:27017"
@@ -455,6 +455,7 @@ var tests = []struct {
 	res   []TestRecordMeta
 	ok    bool
 }{
+	{"_id > 0", []TestRecordMeta{recq1, recq2,recq3,recq4}, true},
 	{"meta.counter = 10", []TestRecordMeta{recq1, recq3}, true},
 	{"meta.counter = 10 ORDER BY _id DESC", []TestRecordMeta{recq3, recq1}, true},
 	{"meta.counter > 10 ORDER BY meta.counter DESC", []TestRecordMeta{recq4, recq2}, true},

tests/manual/python_tests/consumer/consumer_api.py

@@ -7,14 +7,17 @@ source, path,beamtime, token = sys.argv[1:]
 broker = asapo_consumer.create_server_broker(source,path,False, beamtime,"",token,1000)
 group_id = broker.generate_group_id()
 
+res = broker.query_images("_id > 0", substream="1")
 
-data, meta = broker.get_by_id(5,group_id,"default", meta_only=False)
+print(res)
+
+#data, meta = broker.get_by_id(5,group_id,"default", meta_only=False)
 
 #meta["buf_id"]=0
 #data = broker.retrieve_data(meta)
 
-print (meta)
-print (len(data),data[0:100])
-data.tofile("out")
+#print (meta)
+#print (len(data),data[0:100])
+#data.tofile("out")
 
 sys.exit(0)
\ No newline at end of file

tests/manual/python_tests/consumer/test_asap3.sh

 #export PYTHONPATH=/Users/yakubov/projects/asapo/cmake-build-debug/consumer/api/python
 export token=KmUDdacgBzaOD3NIJvN1NmKGqWKtx0DK-NyPjdpeWkc=
-python3 consumer_api.py asap3-utl.desy.de:8400 /gpfs/asapo/shared/test_dir/test_facility/gpfs/test/2019/data/asapo_test asapo_test $token
+export token=_bVfWrAh4S36-xadWkE71i_oOsPPgwFjzIh6UBFCxxU=
+python3 consumer_api.py asap3-utl.desy.de:8400 /gpfs/asapo/shared/test_dir/test_facility/gpfs/test/2019/data/asapo_test 11010325 $token