Add property is/is not resource queries to advanced search

omeka · Dec 9, 2024 · 51340ca · 51340ca
1 parent 2a7334e
commit 51340ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/application/asset/js/global.js b/application/asset/js/global.js
@@ -322,7 +322,7 @@ var Omeka = {
     disableQueryTextInput: function() {
         var queryType = $(this);
         var queryText = queryType.siblings('.query-text');
-        if (queryType.val() === 'ex' || queryType.val() === 'nex') {
+        if (['ex', 'nex', 're', 'nre'].includes(queryType.val())) {
             queryText.prop('disabled', true);
         } else {
             queryText.prop('disabled', false);

diff --git a/application/src/Api/Adapter/AbstractResourceEntityAdapter.php b/application/src/Api/Adapter/AbstractResourceEntityAdapter.php
@@ -277,11 +277,11 @@ protected function buildPropertyQuery(QueryBuilder $qb, array $query)
             }
 
             $positive = true;
-            if (in_array($queryType, ['neq', 'nin', 'nsw', 'new', 'nres', 'nex'])) {
+            if (in_array($queryType, ['neq', 'nin', 'nsw', 'new', 'nre', 'nres', 'nex'])) {
                 $positive = false;
                 $queryType = substr($queryType, 1);
             }
-            if (!in_array($queryType, ['eq', 'in', 'sw', 'ew', 'res', 'ex'])) {
+            if (!in_array($queryType, ['eq', 'in', 'sw', 'ew', 're', 'res', 'ex'])) {
                 continue;
             }
 
@@ -378,6 +378,10 @@ protected function buildPropertyQuery(QueryBuilder $qb, array $query)
                     );
                     break;
 
+                case 're':
+                    $predicateExpr = $qb->expr()->isNotNull("$valuesAlias.valueResource");
+                    break;
+
                 case 'ex':
                     $predicateExpr = $qb->expr()->isNotNull("$valuesAlias.id");
                     break;

diff --git a/application/view/common/advanced-search/properties.phtml b/application/view/common/advanced-search/properties.phtml
@@ -81,6 +81,8 @@ if ($this->status()->isSiteRequest()) {
                 <?php echo $queryOption('nsw', $property, 'type', $translate('does not start with')); ?>
                 <?php echo $queryOption('ew', $property, 'type', $translate('ends with')); ?>
                 <?php echo $queryOption('new', $property, 'type', $translate('does not end with')); ?>
+                <?php echo $queryOption('re', $property, 'type', $translate('is resource')); ?>
+                <?php echo $queryOption('nre', $property, 'type', $translate('is not resource')); ?>
                 <?php echo $queryOption('res', $property, 'type', $translate('is resource with ID')); ?>
                 <?php echo $queryOption('nres', $property, 'type', $translate('is not resource with ID')); ?>
                 <?php echo $queryOption('ex', $property, 'type', $translate('has any value')); ?>