Improve search indexing

.gitignore

@@ -3,3 +3,4 @@
 trace-*.json
 **/.temp
 .DS_Store
+.cargo

CHANGELOG.md

@@ -7,6 +7,9 @@ See [STATUS.md](server/STATUS.md) to learn more about which features will remain
 
 ## UNRELEASED
 
+- **Requires `--rebuild-index`**
+- Improve full-text search, use JSON fields #335
+- Update tantivy.
 - Parse multiple auth cookies #525
 - Fix `--script` flag
 

CONTRIBUTE.md

@@ -114,7 +114,7 @@ There are two ways you can use `tracing` to get insights into performance.
 - Visit jaeger: `http://localhost:16686`
 
 ```sh
-docker run -d --name jaeger \
+docker run -d --platform linux/amd64 --name jaeger \
   -e COLLECTOR_ZIPKIN_HTTP_PORT=9411 \
   -p 5775:5775/udp \
   -p 6831:6831/udp \

lib/src/db/query_index.rs

@@ -117,7 +117,6 @@ pub fn query_indexed(store: &Db, q: &Query) -> AtomicResult<QueryResult> {
         if in_selection {
             let (k, _v) = kv.map_err(|_e| "Unable to parse query_cached")?;
             let (_q_filter, _val, subject) = parse_collection_members_key(&k)?;
-
             // If no external resources should be included, skip this one if it's an external resource
             if !q.include_external && !subject.starts_with(&self_url) {
                 continue;
@@ -140,7 +139,7 @@ pub fn query_indexed(store: &Db, q: &Query) -> AtomicResult<QueryResult> {
                                 "Error when getting resource in collection: {}",
                                 &e
                             )
-                            .into())
+                            .into());
                         }
                     },
                 }

lib/src/populate.rs

@@ -89,7 +89,7 @@ pub fn populate_base_models(store: &impl Storelike) -> AtomicResult<()> {
         },
         Property {
             class_type: Some(urls::PROPERTY.into()),
-            data_type: DataType::AtomicUrl,
+            data_type: DataType::ResourceArray,
             shortname: "allows-only".into(),
             description: "Restricts this Property to only the values inside this one. This essentially turns the Property into an `enum`.".into(),
             subject: urls::ALLOWS_ONLY.into(),

lib/src/resources.rs

@@ -418,12 +418,25 @@ impl Resource {
     ) -> AtomicResult<()> {
         let full_prop = store.get_property(&property)?;
         if let Some(allowed) = full_prop.allows_only {
-            if !allowed.contains(&value.to_string()) {
-                return Err(format!(
-                    "Property '{}' does not allow value '{}'. Allowed: {:?}",
-                    property, value, allowed
-                )
-                .into());
+            let error = Err(format!(
+                "Property '{}' does not allow value '{}'. Allowed: {:?}",
+                property, value, allowed
+            )
+            .into());
+
+            match &value {
+                Value::ResourceArray(value_array) => {
+                    for item in value_array {
+                        if !allowed.contains(&item.to_string()) {
+                            return error;
+                        }
+                    }
+                }
+                _ => {
+                    if !allowed.contains(&value.to_string()) {
+                        return error;
+                    }
+                }
             }
         }
         if full_prop.data_type == value.datatype() {

server/Cargo.toml

@@ -36,7 +36,7 @@ rustls-pemfile = "1"
 sanitize-filename = "0.4"
 serde_json = "1"
 static-files = "0.2"
-tantivy = "0.18"
+tantivy = "0.19"
 tracing = "0.1"
 tracing-actix-web = "0.6"
 tracing-chrome = "0.6"