]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
Improve ACR search and edition
[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / CmsContentSession.java
index 73adc7012860c99503bacf683488d6b0c2fb0235..8d475fd204853737eae48b94629c04fcdf858ea2 100644 (file)
@@ -2,23 +2,31 @@ package org.argeo.cms.acr;
 
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Map;
+import java.util.NavigableMap;
 import java.util.Set;
+import java.util.Spliterator;
+import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import javax.security.auth.Subject;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.DName;
+import org.argeo.api.acr.search.BasicSearch;
+import org.argeo.api.acr.search.BasicSearch.Scope;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.api.uuid.UuidFactory;
-import org.argeo.cms.acr.xml.DomContentProvider;
+import org.argeo.cms.CurrentUser;
 
 /** Implements {@link ProvidedSession}. */
 class CmsContentSession implements ProvidedSession {
@@ -129,9 +137,10 @@ class CmsContentSession implements ProvidedSession {
                        synchronized (CmsContentSession.this) {
                                // TODO optimise
                                for (ContentProvider provider : modifiedProviders) {
-                                       if (provider instanceof DomContentProvider) {
-                                               ((DomContentProvider) provider).persist(s);
-                                       }
+                                       provider.persist(s);
+//                                     if (provider instanceof DomContentProvider) {
+//                                             ((DomContentProvider) provider).persist(s);
+//                                     }
                                }
                                modifiedProviders.clear();
                                return s;
@@ -156,7 +165,7 @@ class CmsContentSession implements ProvidedSession {
                return uuid;
        }
 
-       @Override
+//     @Override
        public Content getSessionRunDir() {
                if (sessionRunDir == null) {
                        String runDirPath = CmsContentRepository.RUN_BASE + '/' + uuid.toString();
@@ -171,24 +180,124 @@ class CmsContentSession implements ProvidedSession {
                return sessionRunDir;
        }
 
-//             @Override
-//             public String findNamespace(String prefix) {
-//                     return prefixes.get(prefix);
-//             }
-//
-//             @Override
-//             public Set<String> findPrefixes(String namespaceURI) {
-//                     Set<String> res = prefixes.entrySet().stream().filter(e -> e.getValue().equals(namespaceURI))
-//                                     .map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet());
-//
-//                     return res;
-//             }
-//
-//             @Override
-//             public String findPrefix(String namespaceURI) {
-//                     if (CrName.CR_NAMESPACE_URI.equals(namespaceURI) && prefixes.containsKey(CrName.CR_DEFAULT_PREFIX))
-//                             return CrName.CR_DEFAULT_PREFIX;
-//                     return ProvidedSession.super.findPrefix(namespaceURI);
-//             }
+       @Override
+       public boolean equals(Object o) {
+               if (o instanceof CmsContentSession session)
+                       return uuid.equals(session.uuid);
+               return false;
+       }
+
+       @Override
+       public String toString() {
+               return "Content Session " + uuid + " (" + CurrentUser.getUsername(subject) + ")";
+       }
+
+       /*
+        * SEARCH
+        */
+       @Override
+       public Stream<Content> search(Consumer<BasicSearch> search) {
+               BasicSearch s = new BasicSearch();
+               search.accept(s);
+               NavigableMap<String, SearchPartition> searchPartitions = new TreeMap<>();
+               for (Scope scope : s.getFrom()) {
+                       String scopePath = scope.getUri().getPath();
+                       NavigableMap<String, ContentProvider> contentProviders = contentRepository.getMountManager()
+                                       .findContentProviders(scopePath);
+                       for (Map.Entry<String, ContentProvider> contentProvider : contentProviders.entrySet()) {
+                               // TODO deal with depth
+                               String relPath;
+                               if (scopePath.startsWith(contentProvider.getKey())) {
+                                       relPath = scopePath.substring(contentProvider.getKey().length());
+                               } else {
+                                       relPath = null;
+                               }
+                               SearchPartition searchPartition = new SearchPartition(s, relPath, contentProvider.getValue());
+                               searchPartitions.put(contentProvider.getKey(), searchPartition);
+                       }
+               }
+               return StreamSupport.stream(new SearchPartitionsSpliterator(searchPartitions), true);
+       }
+
+       class SearchPartition {
+               BasicSearch search;
+               String relPath;
+               ContentProvider contentProvider;
+
+               public SearchPartition(BasicSearch search, String relPath, ContentProvider contentProvider) {
+                       super();
+                       this.search = search;
+                       this.relPath = relPath;
+                       this.contentProvider = contentProvider;
+               }
+
+               public BasicSearch getSearch() {
+                       return search;
+               }
+
+               public String getRelPath() {
+                       return relPath;
+               }
+
+               public ContentProvider getContentProvider() {
+                       return contentProvider;
+               }
+
+       }
+
+       class SearchPartitionsSpliterator implements Spliterator<Content> {
+               NavigableMap<String, SearchPartition> searchPartitions;
+
+               Spliterator<Content> currentSpliterator;
+
+               public SearchPartitionsSpliterator(NavigableMap<String, SearchPartition> searchPartitions) {
+                       super();
+                       this.searchPartitions = searchPartitions;
+                       SearchPartition searchPartition = searchPartitions.pollFirstEntry().getValue();
+                       currentSpliterator = searchPartition.getContentProvider().search(CmsContentSession.this,
+                                       searchPartition.getSearch(), searchPartition.getRelPath());
+               }
+
+               @Override
+               public boolean tryAdvance(Consumer<? super Content> action) {
+                       boolean remaining = currentSpliterator.tryAdvance(action);
+                       if (remaining)
+                               return true;
+                       if (searchPartitions.isEmpty())
+                               return false;
+                       SearchPartition searchPartition = searchPartitions.pollFirstEntry().getValue();
+                       currentSpliterator = searchPartition.getContentProvider().search(CmsContentSession.this,
+                                       searchPartition.getSearch(), searchPartition.getRelPath());
+                       return true;
+               }
+
+               @Override
+               public Spliterator<Content> trySplit() {
+                       if (searchPartitions.isEmpty()) {
+                               return null;
+                       } else if (searchPartitions.size() == 1) {
+                               NavigableMap<String, SearchPartition> newSearchPartitions = new TreeMap<>(searchPartitions);
+                               searchPartitions.clear();
+                               return new SearchPartitionsSpliterator(newSearchPartitions);
+                       } else {
+                               NavigableMap<String, SearchPartition> newSearchPartitions = new TreeMap<>();
+                               for (int i = 0; i < searchPartitions.size() / 2; i++) {
+                                       Map.Entry<String, SearchPartition> searchPartition = searchPartitions.pollLastEntry();
+                                       newSearchPartitions.put(searchPartition.getKey(), searchPartition.getValue());
+                               }
+                               return new SearchPartitionsSpliterator(newSearchPartitions);
+                       }
+               }
 
+               @Override
+               public long estimateSize() {
+                       return Long.MAX_VALUE;
+               }
+
+               @Override
+               public int characteristics() {
+                       return NONNULL;
+               }
+
+       }
 }
\ No newline at end of file