wikitag: comparison Entity/DocumentRepository.php

equal deleted inserted replaced

-:989d9e117586
+:e7384fb35f7a
 if(is_null($this->reflection_doc_class))
 {
 $this->reflection_doc_class = new ReflectionClass(get_class($object));
 }
-$set_method = NULL;
+$set_method = null;
 if($this->reflection_doc_class->hasMethod($method_name))
 {
 $set_method = $this->reflection_doc_class->getMethod($method_name);
 }
 if(!is_null($set_method))
 if(isset($this->getClassMetadata()->columnNames[$field_name]))
 {
 return $this->getClassMetadata()->columnNames[$field_name];
 }
-$res = $field_name;
+$res = null;
 if(isset($this->getClassMetadata()->associationMappings[$field_name]))
 {
 $association_mapping = $this->getClassMetadata()->associationMappings[$field_name];
 if(
 isset($association_mapping['type'])
 {
 $res = $association_mapping['joinColumns'][0]['name'];
 }
 }
+if(is_null($res)) {
+throw new \Exception("WikiTag.DocumentRepository: Unknown field $field_name");
+}
 return $res;
 }
 /**
 * Write a wikitag document given the host document and the field list.
 /**
 * Search wikitag documents using the index.
 *
 * @param array $values : key: the fields to search into, value : array('value'=>value, 'weight'=>weight)
-* @param array $conditions : array : key : field name, value : simple value (operator is "=") or array(valuea, value2,...) (operatr is IN) or array("operator"=>"", "value"=>value)
+* @param array $conditions : array : key : field name, value : simple value (operator is "=") or array(valuea, value2,...) (operatr is IN) or array("operator"=>"=","!=","<".">","<=".">=","like","ilike","in">, "value"=>value)
+* @param array $fields : array : a list of field name to include in the result
 * @return array [["id" => <the wikitag document id>, "externalId" => <the host document ids>, "score" => <the score for this document>]]
 */
-function search(array $values, array $conditions=NULL)
+function search(array $values, array $conditions=null, array $fields=null)
 {
 $em = $this->getEntityManager();
+if(is_null($fields)) {
+$fieldnamelist = array();
+}
+else {
+$fieldnamelist = $fields;
+}
 $rsm = new ResultSetMapping();
 $rsm->addEntityResult("IRI\Bundle\WikiTagBundle\Entity\Document", "d");
 $rsm->addFieldResult("d", "id", "id");
+foreach($fieldnamelist as $fieldname) {
+$rsm->addFieldResult("d", $fieldname, $fieldname);
+}
 $rsm->addScalarResult("score", "score");
-$rsm->addMetaResult("d", "external_id", "externalId");
+$rsm->addMetaResult("d", "external_id", "external_id");
 $score = array();
 $i = 0;
 foreach ($values as $fielddef) {
 {
 $conditions_array = array();
 $i = 0;
 foreach ($conditions as $field => $conddef)
 {
+if(!$field) {
+continue;
+}
 $i++;
 $col = $this->getColumnName($field);
 if(is_array($conddef) && isset($conddef['operator']))
 {
 $operator = $conddef["operator"];
 }
 else
 {
 $operator = "=";
 $values = $conddef;
+}
+if(!in_array( strtolower($operator), array("=","!=","<".">","<=".">=","like","ilike"))) {
+throw new Exception('DocumentRepository.search : operator must be in "=","!=","<".">","<=".">=","like","ilike"');
 }
 if($operator === "IN")
 {
 $in_parameters = array();
 {
 $conditions_str = " AND ".implode(" AND ", $conditions_array);
 }
 }
+$fieldnamequery = "d.id, d.external_id";
-$query = $em->createNativeQuery("SELECT d.id, d.external_id, $score_def AS score FROM wikitag_document d WHERE $score_def > 0  $conditions_str ORDER BY score DESC", $rsm);
+if(count($fieldnamelist) > 0) {
+$fieldnamequery .= ", d.".join(", d.", $fieldnamelist);
+}
+$query = $em->createNativeQuery("SELECT $fieldnamequery, $score_def AS score FROM wikitag_document d WHERE $score_def > 0  $conditions_str ORDER BY score DESC", $rsm);
 $query->setParameters($parameters);
 $res = $query->getResult();

changeset 68	e7384fb35f7a
parent 67	989d9e117586
child 74	901463f9b11c