Skip to content

Partial search fix (amended) #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvonkleist wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Partial search fix (amended) #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions packages/collections/lib/core/archon.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,8 +937,10 @@ public function getCollectionIDForNumber($RecordSeriesNumber)

$ClassificationID = 0;

$mySearch = true;
while(count($arrClassifications) > 1)
{
$mySearch = false;
$ClassificationIdentifier = array_shift($arrClassifications);
$prevClassificationID = $ClassificationID;

Expand Down Expand Up @@ -1003,10 +1005,19 @@ public function getCollectionIDForNumber($RecordSeriesNumber)
$minLengthVars = array();
}

$query = "SELECT ID FROM tblCollections_Collections WHERE ClassificationID = ? AND (CollectionIdentifier LIKE ?$minLengthQuery);"; // replace CollectionIdentifier = with CollectionIdentifier Like
if ($ClassificationID != 0 && !$mySearch)
{
$query = "SELECT ID FROM tblCollections_Collections WHERE ClassificationID = ? AND (CollectionIdentifier LIKE ?$minLengthQuery);"; // change exact search to partial on collection identifier using Like statement
$types = array_merge(array('integer', 'text'), $minLengthTypes);
$vars = array_merge(array($ClassificationID, "%$CollectionIdentifier%"), $minLengthVars); //added wildcards with $CollectionIdentifier for partial search

$vars = array_merge(array($ClassificationID, "%$CollectionIdentifier%"), $minLengthVars);
}
else
{
// implemented partial search on collection and classification identifier
$query = "SELECT tblCollections_Collections.ID FROM tblCollections_Collections LEFT JOIN tblCollections_Classifications ON tblCollections_Classifications.ID = tblCollections_Collections.ClassificationID WHERE (CollectionIdentifier LIKE ? OR ClassificationIdentifier LIKE ?$minLengthQuery);";
$types = array_merge(array('text', 'text'), $minLengthTypes);
$vars = array_merge(array("%$CollectionIdentifier%", "%$CollectionIdentifier%"), $minLengthVars);
}
if(!isset($preps[$query]))
{
$preps[$query] = $this->mdb2->prepare($query, $types, MDB2_PREPARE_RESULT);
Expand All @@ -1017,10 +1028,22 @@ public function getCollectionIDForNumber($RecordSeriesNumber)
trigger_error($result->getMessage(), E_USER_ERROR);
}

$row = $result->fetchRow();
$rows = $result->fetchAll();
$result->free();

return $row['ID'] ? $row['ID'] : 0;
$ids = array();
if (!empty($rows))
{
foreach ($rows as $row)
{
$ids[] = $row["ID"];
}
}
else
{
return 0;
}
return implode(",", $ids);
}

/**
Expand Down Expand Up @@ -2069,9 +2092,7 @@ public function searchCollections($SearchQuery, $SearchFlags = SEARCH_COLLECTION
$ID = $this->getCollectionIDForNumber($SearchQuery);
if($ID)
{
$subquery .= " OR ID = ?";
$subtypes[] = 'integer';
$subvars[] = $ID;
$subquery .= " OR ID IN (" . $ID . ")"; //changes to get multiple records in case of partial search
}

// If our query is just a number, try to match it
Expand Down Expand Up @@ -2449,9 +2470,7 @@ public function searchCollectionsByBook($SearchQuery, $SearchFlags = SEARCH_COLL
$ID = $this->getCollectionIDForNumber($SearchQuery);
if($ID)
{
$subquery .= " OR ID = ?";
$subtypes[] = 'integer';
$subvars[] = $ID;
$subquery .= " OR ID IN (" . $ID . ")"; //changes to get multiple records in case of partial search
}

// If our query is just a number, try to match it
Expand Down Expand Up @@ -2847,9 +2866,7 @@ public function searchCollectionsByClassification($SearchQuery, $SearchFlags = S
$ID = $this->getCollectionIDForNumber($SearchQuery);
if($ID)
{
$subquery .= " OR ID = ?";
$subtypes[] = 'integer';
$subvars[] = $ID;
$subquery .= " OR ID IN (" . $ID . ")"; //changes to get multiple records in case of partial search
}

// If our query is just a number, try to match it
Expand Down