Fixed some formatting to comply with style guidelines.
This commit is contained in:
paul
parent
6f2013845c
commit
27af739fe8
1 changed files with 247 additions and 154 deletions
|
|
@ -47,8 +47,7 @@ class DataEngine{
|
|||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param gb reference to BasicStor object
|
||||
* @return this
|
||||
* @param BasicStor $gb
|
||||
*/
|
||||
function DataEngine(&$gb)
|
||||
{
|
||||
|
|
@ -64,12 +63,15 @@ class DataEngine{
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Method returning array with where-parts of sql queries
|
||||
*
|
||||
* @param conditions array - see conditions field in search criteria format
|
||||
* @param array $conditions
|
||||
* See 'conditions' field in search criteria format
|
||||
* definition in DataEngine class documentation
|
||||
* @return array of strings - where-parts of SQL qyeries
|
||||
* @return array
|
||||
* array of strings - WHERE-parts of SQL queries
|
||||
*/
|
||||
function _makeWhereArr($conditions)
|
||||
{
|
||||
|
|
@ -90,7 +92,9 @@ class DataEngine{
|
|||
// retype for timestamp value
|
||||
if ($cat == 'mtime') {
|
||||
switch ($op) {
|
||||
case'partial': case'prefix': break;
|
||||
case 'partial':
|
||||
case 'prefix':
|
||||
break;
|
||||
default:
|
||||
$retype = "::timestamp with time zone";
|
||||
$opVal = "$retype $opVal$retype";
|
||||
|
|
@ -113,17 +117,25 @@ class DataEngine{
|
|||
return $whereArr;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Method returning SQL query for search/browse with AND operator
|
||||
* (without using INTERSECT command)
|
||||
*
|
||||
* @param fldsPart string - fields part of sql query
|
||||
* @param whereArr array - array of where-parts
|
||||
* @param fileCond string - condition for files table
|
||||
* @param browse boolean - true if browse vals required instead of gunids
|
||||
* @param brFldNs string - namespace prefix of category for browse
|
||||
* @param brFld string - category for browse
|
||||
* @return query string
|
||||
* @param string $fldsPart
|
||||
* fields part of SQL query
|
||||
* @param array $whereArr
|
||||
* array of WHERE-parts
|
||||
* @param string $fileCond
|
||||
* Condition for files table
|
||||
* @param boolean $browse
|
||||
* TRUE if browse vals required instead of gunids
|
||||
* @param string $brFldNs
|
||||
* Namespace prefix of category for browse
|
||||
* @param string $brFld
|
||||
* Category for browse
|
||||
* @return string
|
||||
* query
|
||||
*/
|
||||
function _makeAndSqlWoIntersect($fldsPart, $whereArr, $fileCond, $browse,
|
||||
$brFldNs=NULL, $brFld=NULL)
|
||||
|
|
@ -132,8 +144,7 @@ class DataEngine{
|
|||
foreach ($whereArr as $i => $v) {
|
||||
$whereArr[$i] = sprintf($v, "md$i", "md$i", "md$i", "md$i", "md$i");
|
||||
$lastTbl = ($i==0 ? "f" : "md".($i-1));
|
||||
$innerBlocks[] =
|
||||
"INNER JOIN {$this->mdataTable} md$i ON md$i.gunid = $lastTbl.gunid\n";
|
||||
$innerBlocks[] = "INNER JOIN {$this->mdataTable} md$i ON md$i.gunid = $lastTbl.gunid\n";
|
||||
}
|
||||
// query construcion:
|
||||
$sql = "SELECT $fldsPart\nFROM {$this->filesTable} f\n".join("", $innerBlocks);
|
||||
|
|
@ -141,32 +152,49 @@ class DataEngine{
|
|||
$sql .= "INNER JOIN {$this->mdataTable} br".
|
||||
"\n ON br.gunid = f.gunid AND br.objns='_L'".
|
||||
" AND br.predicate='{$brFld}' AND br.predxml='T'";
|
||||
if(!is_null($brFldNs)) $sql .= " AND br.predns='{$brFldNs}'";
|
||||
if (!is_null($brFldNs)) {
|
||||
$sql .= " AND br.predns='{$brFldNs}'";
|
||||
}
|
||||
$sql .= "\n";
|
||||
}
|
||||
if(!is_null($fileCond)) $whereArr[] = " $fileCond";
|
||||
if(count($whereArr)>0) $sql .= "WHERE\n".join(" AND\n", $whereArr);
|
||||
if($browse) $sql .= "\nORDER BY br.object";
|
||||
if (!is_null($fileCond)) {
|
||||
$whereArr[] = " $fileCond";
|
||||
}
|
||||
if (count($whereArr) > 0) {
|
||||
$sql .= "WHERE\n".join(" AND\n", $whereArr);
|
||||
}
|
||||
if ($browse) {
|
||||
$sql .= "\nORDER BY br.object";
|
||||
}
|
||||
return $sql;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Method returning SQL query for search/browse with AND operator
|
||||
* (using INTERSECT command)
|
||||
*
|
||||
* @param fldsPart string - fields part of sql query
|
||||
* @param whereArr array - array of where-parts
|
||||
* @param fileCond string - condition for files table
|
||||
* @param browse boolean - true if browse vals required instead of gunids
|
||||
* @param brFldNs string - namespace prefix of category for browse
|
||||
* @param brFld string - category for browse
|
||||
* @return query string
|
||||
* @param string $fldsPart
|
||||
* Fields part of sql query
|
||||
* @param array $whereArr
|
||||
* Array of where-parts
|
||||
* @param string $fileCond
|
||||
* Condition for files table
|
||||
* @param boolean $browse
|
||||
* true if browse vals required instead of gunids
|
||||
* @param string $brFldNs
|
||||
* namespace prefix of category for browse
|
||||
* @param string $brFld
|
||||
* category for browse
|
||||
* @return string
|
||||
* query
|
||||
*/
|
||||
function _makeAndSql($fldsPart, $whereArr, $fileCond, $browse,
|
||||
$brFldNs=NULL, $brFld=NULL)
|
||||
{
|
||||
if(!USE_INTERSECT) return $this->_makeAndSqlWoIntersect(
|
||||
$fldsPart, $whereArr, $fileCond, $browse, $brFldNs, $brFld);
|
||||
if (!USE_INTERSECT) {
|
||||
return $this->_makeAndSqlWoIntersect($fldsPart, $whereArr, $fileCond, $browse, $brFldNs, $brFld);
|
||||
}
|
||||
$isectBlocks = array();
|
||||
foreach ($whereArr as $i => $v) {
|
||||
$whereArr[$i] = sprintf($v, "md$i", "md$i", "md$i", "md$i", "md$i");
|
||||
|
|
@ -182,29 +210,43 @@ class DataEngine{
|
|||
} else {
|
||||
$isectBlock = "FROM {$this->filesTable} f";
|
||||
}
|
||||
$sql =
|
||||
"SELECT $fldsPart\n".$isectBlock;
|
||||
$sql = "SELECT $fldsPart\n".$isectBlock;
|
||||
if ($browse) {
|
||||
$sql .= "\nINNER JOIN {$this->mdataTable} br ON br.gunid = f.gunid\n".
|
||||
"WHERE br.objns='_L' AND br.predxml='T' AND br.predicate='{$brFld}'";
|
||||
if(!is_null($brFldNs)) $sql .= " AND br.predns='{$brFldNs}'";
|
||||
if (!is_null($brFldNs)) {
|
||||
$sql .= " AND br.predns='{$brFldNs}'";
|
||||
}
|
||||
$glue = " AND";
|
||||
}else{ $glue = "WHERE";}
|
||||
if(!is_null($fileCond)) $sql .= "\n$glue $fileCond";
|
||||
if($browse) $sql .= "\nORDER BY br.object";
|
||||
} else {
|
||||
$glue = "WHERE";
|
||||
}
|
||||
if (!is_null($fileCond)) {
|
||||
$sql .= "\n$glue $fileCond";
|
||||
}
|
||||
if ($browse) {
|
||||
$sql .= "\nORDER BY br.object";
|
||||
}
|
||||
return $sql;
|
||||
}
|
||||
|
||||
/**
|
||||
* Method returning SQL query for search/browse with OR operator
|
||||
*
|
||||
* @param fldsPart string - fields part of sql query
|
||||
* @param whereArr array - array of where-parts
|
||||
* @param fileCond string - condition for files table
|
||||
* @param browse boolean - true if browse vals required instead of gunids
|
||||
* @param brFldNs string - namespace prefix of category for browse
|
||||
* @param brFld string - category for browse
|
||||
* @return query string
|
||||
* @param string $fldsPart
|
||||
* Fields part of sql query
|
||||
* @param array $whereArr
|
||||
* Array of where-parts
|
||||
* @param string $fileCond
|
||||
* Condition for files table
|
||||
* @param boolean $browse
|
||||
* True if browse vals required instead of gunids
|
||||
* @param string $brFldNs
|
||||
* Namespace prefix of category for browse
|
||||
* @param string $brFld
|
||||
* Category for browse
|
||||
* @return string
|
||||
* query
|
||||
*/
|
||||
function _makeOrSql($fldsPart, $whereArr, $fileCond, $browse,
|
||||
$brFldNs=NULL, $brFld=NULL)
|
||||
|
|
@ -219,26 +261,39 @@ class DataEngine{
|
|||
$sql .= "INNER JOIN {$this->mdataTable} br".
|
||||
"\n ON br.gunid = f.gunid AND br.objns='_L'".
|
||||
" AND br.predxml='T' AND br.predicate='{$brFld}'";
|
||||
if(!is_null($brFldNs)) $sql .= " AND br.predns='{$brFldNs}'";
|
||||
if (!is_null($brFldNs)) {
|
||||
$sql .= " AND br.predns='{$brFldNs}'";
|
||||
}
|
||||
$sql .= "\n";
|
||||
}
|
||||
if (count($whereArr) > 0) {
|
||||
$sql .= "INNER JOIN {$this->mdataTable} md ON md.gunid=f.gunid\n";
|
||||
$sql .= "WHERE\n(\n".join(" OR\n", $whereArr).")";
|
||||
$glue = " AND";
|
||||
}else{ $glue = "WHERE"; }
|
||||
if(!is_null($fileCond)) $sql .= "$glue $fileCond";
|
||||
if($browse) $sql .= "\nORDER BY br.object";
|
||||
} else {
|
||||
$glue = "WHERE";
|
||||
}
|
||||
if (!is_null($fileCond)) {
|
||||
$sql .= "$glue $fileCond";
|
||||
}
|
||||
if ($browse) {
|
||||
$sql .= "\nORDER BY br.object";
|
||||
}
|
||||
return $sql;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Search in local metadata database.
|
||||
*
|
||||
* @param cri hash, search criteria see DataEngine class documentation
|
||||
* @param limit int, limit for result arrays (0 means unlimited)
|
||||
* @param offset int, starting point (0 means without offset)
|
||||
* @return hash, fields:
|
||||
* @param array $cri
|
||||
* Search criteria see DataEngine class documentation
|
||||
* @param int $limit
|
||||
* Limit for result arrays (0 means unlimited)
|
||||
* @param int $offset
|
||||
* Starting point (0 means without offset)
|
||||
* @return array
|
||||
* hash, fields:
|
||||
* results : array with gunid strings
|
||||
* cnt : integer - number of matching gunids
|
||||
* of files have been found
|
||||
|
|
@ -250,15 +305,22 @@ class DataEngine{
|
|||
return $res;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Search in local metadata database, more general version.
|
||||
*
|
||||
* @param criteria hash, search criteria see DataEngine class documentation
|
||||
* @param limit int, limit for result arrays (0 means unlimited)
|
||||
* @param offset int, starting point (0 means without offset)
|
||||
* @param brFldNs string - namespace prefix of category for browse
|
||||
* @param brFld string, metadata category identifier for browse
|
||||
* @return arrays of hashes, fields:
|
||||
* @param hash $criteria
|
||||
* Search criteria see DataEngine class documentation
|
||||
* @param int $limit
|
||||
* Limit for result arrays (0 means unlimited)
|
||||
* @param int $offset
|
||||
* Starting point (0 means without offset)
|
||||
* @param string $brFldNs
|
||||
* Namespace prefix of category for browse
|
||||
* @param string $brFld
|
||||
* Metadata category identifier for browse
|
||||
* @return array
|
||||
* arrays of hashes, fields:
|
||||
* cnt : integer - number of matching gunids
|
||||
* of files have been found
|
||||
* results : array of hashes:
|
||||
|
|
@ -305,13 +367,13 @@ class DataEngine{
|
|||
$limitPart = ($limit != 0 ? " LIMIT $limit" : '' ).
|
||||
($offset != 0 ? " OFFSET $offset" : '' );
|
||||
$fileCond = "f.state='ready'";
|
||||
if(!is_null($filetype)) $fileCond .= " AND f.ftype='$filetype'";
|
||||
if (!is_null($filetype)) {
|
||||
$fileCond .= " AND f.ftype='$filetype'";
|
||||
}
|
||||
if ($operator == 'and') { // operator: and
|
||||
$sql = $this->_makeAndSql(
|
||||
$fldsPart, $whereArr, $fileCond, $browse, $brFldNs, $brFld);
|
||||
$sql = $this->_makeAndSql($fldsPart, $whereArr, $fileCond, $browse, $brFldNs, $brFld);
|
||||
} else { // operator: or
|
||||
$sql = $this->_makeOrSql(
|
||||
$fldsPart, $whereArr, $fileCond, $browse, $brFldNs, $brFld);
|
||||
$sql = $this->_makeOrSql($fldsPart, $whereArr, $fileCond, $browse, $brFldNs, $brFld);
|
||||
}
|
||||
if (!$browse && $orderby) {
|
||||
$retype = ($orderby == 'mtime' ? '::timestamp with time zone' : '' );
|
||||
|
|
@ -326,10 +388,16 @@ class DataEngine{
|
|||
}
|
||||
// echo "\n---\n$sql\n---\n";
|
||||
$cnt = $this->_getNumRows($sql);
|
||||
if(PEAR::isError($cnt)) return $cnt;
|
||||
if (PEAR::isError($cnt)) {
|
||||
return $cnt;
|
||||
}
|
||||
$res = $this->dbc->getAll($sql.$limitPart);
|
||||
if(PEAR::isError($res)) return $res;
|
||||
if(!is_array($res)) $res = array();
|
||||
if (PEAR::isError($res)) {
|
||||
return $res;
|
||||
}
|
||||
if (!is_array($res)) {
|
||||
$res = array();
|
||||
}
|
||||
# if (!$browse) {
|
||||
# $res = array_map(array("StoredFile", "_normalizeGunid"), $res);
|
||||
# }
|
||||
|
|
@ -338,16 +406,24 @@ class DataEngine{
|
|||
if (!$browse) {
|
||||
$gunid = StoredFile::_normalizeGunid($it['gunid']);
|
||||
$titleA = $r = $this->gb->bsGetMetadataValue($it['id'], 'dc:title');
|
||||
if(PEAR::isError($r)) return $r;
|
||||
if (PEAR::isError($r)) {
|
||||
return $r;
|
||||
}
|
||||
$title = (isset($titleA[0]['value']) ? $titleA[0]['value'] : '');
|
||||
$creatorA = $r = $this->gb->bsGetMetadataValue($it['id'], 'dc:creator');
|
||||
if(PEAR::isError($r)) return $r;
|
||||
if (PEAR::isError($r)) {
|
||||
return $r;
|
||||
}
|
||||
$creator = (isset($creatorA[0]['value']) ? $creatorA[0]['value'] : '');
|
||||
$sourceA = $r = $this->gb->bsGetMetadataValue($it['id'], 'dc:source');
|
||||
if(PEAR::isError($r)) return $r;
|
||||
if (PEAR::isError($r)) {
|
||||
return $r;
|
||||
}
|
||||
$source = (isset($sourceA[0]['value']) ? $sourceA[0]['value'] : '');
|
||||
$lengthA = $r = $this->gb->bsGetMetadataValue($it['id'], 'dcterms:extent');
|
||||
if(PEAR::isError($r)) return $r;
|
||||
if (PEAR::isError($r)) {
|
||||
return $r;
|
||||
}
|
||||
$length = (isset($lengthA[0]['value']) ? $lengthA[0]['value'] : '');
|
||||
$eres[] = array(
|
||||
'gunid' => $gunid,
|
||||
|
|
@ -364,15 +440,19 @@ class DataEngine{
|
|||
return array('results'=>$eres, 'cnt'=>$cnt);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return values of specified metadata category
|
||||
*
|
||||
* @param category string, metadata category name
|
||||
* with or without namespace prefix (dc:title, author)
|
||||
* @param limit int, limit for result arrays (0 means unlimited)
|
||||
* @param offset int, starting point (0 means without offset)
|
||||
* @param criteria hash
|
||||
* @return hash, fields:
|
||||
* @param string $category
|
||||
* metadata category name, with or without namespace prefix (dc:title, author)
|
||||
* @param int $limit
|
||||
* limit for result arrays (0 means unlimited)
|
||||
* @param int $offset
|
||||
* starting point (0 means without offset)
|
||||
* @param array $criteria
|
||||
* @return array
|
||||
* hash, fields:
|
||||
* results : array with found values
|
||||
* cnt : integer - number of matching values
|
||||
*/
|
||||
|
|
@ -396,29 +476,42 @@ class DataEngine{
|
|||
"WHERE $sqlCond";
|
||||
// echo "\n---\n$sql\n---\n";
|
||||
$cnt = $this->_getNumRows($sql);
|
||||
if(PEAR::isError($cnt)) return $cnt;
|
||||
if (PEAR::isError($cnt)) {
|
||||
return $cnt;
|
||||
}
|
||||
$res = $this->dbc->getCol($sql.$limitPart);
|
||||
if(PEAR::isError($res)) return $res;
|
||||
if(!is_array($res)) $res = array();
|
||||
if (PEAR::isError($res)) {
|
||||
return $res;
|
||||
}
|
||||
if (!is_array($res)) {
|
||||
$res = array();
|
||||
}
|
||||
return array('results'=>$res, 'cnt'=>$cnt);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get number of rows in query result
|
||||
*
|
||||
* @param query string, sql query
|
||||
* @return int, number of rows in query result
|
||||
* @param string $query
|
||||
* SQL query
|
||||
* @return int
|
||||
* Number of rows in query result
|
||||
*/
|
||||
function _getNumRows($query)
|
||||
{
|
||||
$rh = $this->dbc->query($query);
|
||||
if(PEAR::isError($rh)) return $rh;
|
||||
if (PEAR::isError($rh)) {
|
||||
return $rh;
|
||||
}
|
||||
$cnt = $rh->numRows();
|
||||
if(PEAR::isError($cnt)) return $cnt;
|
||||
if (PEAR::isError($cnt)) {
|
||||
return $cnt;
|
||||
}
|
||||
$rh->free();
|
||||
return $cnt;
|
||||
}
|
||||
|
||||
}
|
||||
} // class DataEngine
|
||||
|
||||
?>
|
||||
Loading…
Add table
Add a link
Reference in a new issue