diff --git a/common/src/main/java/org/fao/geonet/utils/XmlRequest.java b/common/src/main/java/org/fao/geonet/utils/XmlRequest.java index eccb6ca4f3e..7b6a3b69c59 100644 --- a/common/src/main/java/org/fao/geonet/utils/XmlRequest.java +++ b/common/src/main/java/org/fao/geonet/utils/XmlRequest.java @@ -118,7 +118,7 @@ protected final Element executeAndReadResponse(HttpRequestBase httpMethod) throw final ClientHttpResponse httpResponse = doExecute(httpMethod); if (httpResponse.getRawStatusCode() > 399) { - httpMethod.releaseConnection(); + httpMethod.releaseConnection(); throw new BadServerResponseEx(httpResponse.getStatusText() + " -- URI: " + httpMethod.getURI() + " -- Response Code: " + httpResponse.getRawStatusCode()); diff --git a/common/src/main/java/org/fao/geonet/utils/XmlResolver.java b/common/src/main/java/org/fao/geonet/utils/XmlResolver.java index 6323217eda4..70f6316634b 100644 --- a/common/src/main/java/org/fao/geonet/utils/XmlResolver.java +++ b/common/src/main/java/org/fao/geonet/utils/XmlResolver.java @@ -127,10 +127,10 @@ public LSInput resolveResource(String type, String namespaceURI, String publicId } } } catch (MalformedURLException e) { // leave this to someone else? - e.printStackTrace(); + Log.error(Log.XML_RESOLVER, e.getMessage(), e); return result; } catch (URISyntaxException e) { // leave this to someone else? - e.printStackTrace(); + Log.error(Log.XML_RESOLVER, e.getMessage(), e); return result; } @@ -141,8 +141,7 @@ public LSInput resolveResource(String type, String namespaceURI, String publicId try { elResult = isXmlInCache(externalRef.toString()); } catch (CacheException e) { - Log.error(Log.XML_RESOLVER, "Request to cache for " + externalRef + " failed."); - e.printStackTrace(); + Log.error(Log.XML_RESOLVER, "Request to cache for " + externalRef + " failed.", e); } if (elResult == null) { // use XMLRequest to get the XML diff --git a/core/src/main/java/jeeves/config/springutil/LogoutUserSessionHandler.java b/core/src/main/java/jeeves/config/springutil/LogoutUserSessionHandler.java index 63980a8ab52..0f0e083f7ee 100644 --- a/core/src/main/java/jeeves/config/springutil/LogoutUserSessionHandler.java +++ b/core/src/main/java/jeeves/config/springutil/LogoutUserSessionHandler.java @@ -50,6 +50,7 @@ public void logout(HttpServletRequest request, UserSession userSession = (UserSession) tmp; userSession.clear(); } + httpSession.invalidate(); } } diff --git a/core/src/main/java/org/fao/geonet/constants/Geonet.java b/core/src/main/java/org/fao/geonet/constants/Geonet.java index b072b4a1ae9..fce9db2dfc2 100644 --- a/core/src/main/java/org/fao/geonet/constants/Geonet.java +++ b/core/src/main/java/org/fao/geonet/constants/Geonet.java @@ -99,6 +99,11 @@ public final class Geonet { public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd-MM-yyyy_HHmm"); public static final String BATCHEDIT_BACKUP_BUCKET = "https://s3-ap-southeast-2.amazonaws.com/ga-ecat3-batchedit/"; + public static final String BATCHEDIT_REPORT = "be_report"; + public static final String BATCHEDIT_BACKUP = "be_backup"; + public static final String BATCHEDIT_PROGRESS = "be_progress"; + public static final String CSV_DOWNLOAD_STATUS = "csv_download_status"; + /** * Container for file names. */ @@ -479,6 +484,8 @@ public static final class SearchResult { */ public static final String ECAT_ID = "eCatId"; + public static final String KEYWORD = "keyword"; + /** * Attrset used in Z39.50 search */ @@ -545,6 +552,7 @@ public static final class SortBy { public static final String RATING = "rating"; public static final String POPULARITY = "popularity"; public static final String DATE = "changeDate"; + public static final String PUBLICATION_DATE = "publicationDate"; /** * Parameter name: {@value #_TITLE} - Title not tokenized mainly used for sorting @@ -552,6 +560,7 @@ public static final class SortBy { */ public static final String TITLE = "title"; public static final String SCALE_DENOMINATOR = "denominator"; + public static final String ECATID = "eCatId"; } } diff --git a/core/src/main/java/org/fao/geonet/guiservices/schemas/GetSchemaInfo.java b/core/src/main/java/org/fao/geonet/guiservices/schemas/GetSchemaInfo.java index 65af53a9de7..7f47a2fdfa2 100644 --- a/core/src/main/java/org/fao/geonet/guiservices/schemas/GetSchemaInfo.java +++ b/core/src/main/java/org/fao/geonet/guiservices/schemas/GetSchemaInfo.java @@ -30,6 +30,7 @@ import org.fao.geonet.GeonetContext; import org.fao.geonet.constants.Geonet; import org.fao.geonet.kernel.SchemaManager; +import org.fao.geonet.utils.Log; import org.jdom.Element; import java.nio.file.Path; @@ -69,8 +70,7 @@ public Element exec(Element params, ServiceContext context) throws Exception { schemas.addContent(schemaElem); } } catch (Exception e) { - context.error("Failed to load guiservices for schema " + schema + ": " + e.getMessage()); - e.printStackTrace(); + Log.error(Geonet.GEONETWORK, "Failed to load guiservices for schema "+schema+": "+e.getMessage(), e); } } diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/BatchEditReport.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/BatchEditReport.java index 966d312a45e..0375ca46904 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/BatchEditReport.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/BatchEditReport.java @@ -10,17 +10,25 @@ public class BatchEditReport implements Serializable { private List processInfo; public List getErrorInfo() { - if (errorInfo == null) { - errorInfo = new ArrayList<>(); + if(this.errorInfo == null){ + return new ArrayList(); } - return errorInfo; + return new ArrayList(this.errorInfo); + } + + public void setErrorInfo(List errorInfo) { + this.errorInfo = new ArrayList(errorInfo); } public List getProcessInfo() { - if (processInfo == null) { - processInfo = new ArrayList<>(); + if(this.processInfo == null){ + return new ArrayList(); } - return processInfo; + return new ArrayList(this.processInfo); + } + + public void setProcessInfo(List processInfo) { + this.processInfo = new ArrayList(processInfo); } } diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/CSVBatchEdit.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/CSVBatchEdit.java index c7277f52bcb..ae965c1eed8 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/CSVBatchEdit.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/CSVBatchEdit.java @@ -105,6 +105,7 @@ public BatchEditReport removeOrAddElements(ApplicationContext context, ServiceCo XPath _xpath, Document metadata, List listOfUpdates, String mode) { BatchEditReport report = new BatchEditReport(); + final SchemaManager schemaManager = context.getBean(SchemaManager.class); String headerVal = header.getKey(); EditElement editElement = EditElementFactory.getElementType(headerVal); @@ -117,6 +118,9 @@ public BatchEditReport removeOrAddElements(ApplicationContext context, ServiceCo } if(StringUtils.isNotEmpty(csvr.get(headerVal).trim())){ + + List errs = report.getErrorInfo(); + if(editElement != null){ if(checkDependencies(headerVal, csvr) && mode.equals("remove")){ @@ -133,7 +137,7 @@ public BatchEditReport removeOrAddElements(ApplicationContext context, ServiceCo } catch (Exception e) { //Log.error(Geonet.SEARCH_ENGINE, "Unable to remove existing element for eCatId/UUID " + id +" for the value " + csvr.get(headerVal) +", " + e.getLocalizedMessage()); - report.getErrorInfo().add("Unable to remove existing element for the value " + csvr.get(headerVal) +", " + e.getMessage()); + errs.add("Unable to remove existing element for the value " + csvr.get(headerVal) +", " + e.getMessage()); } } @@ -150,7 +154,7 @@ public BatchEditReport removeOrAddElements(ApplicationContext context, ServiceCo } } catch (Exception e) { //Log.error(Geonet.SEARCH_ENGINE, "Unable to set the attribute for eCatId/UUID " + id +" for the value " + csvr.get(headerVal) +", " + e.getMessage()); - report.getErrorInfo().add("Unable to set the attribute for the value, " + headerVal + ": "+ csvr.get(headerVal) +", " + e.getMessage()); + errs.add("Unable to set the attribute for the value, " + headerVal + ": "+ csvr.get(headerVal) +", " + e.getMessage()); } } else { try { @@ -165,9 +169,10 @@ public BatchEditReport removeOrAddElements(ApplicationContext context, ServiceCo } } catch (Exception e) { //Log.error(Geonet.SEARCH_ENGINE, "Unable to set text for eCatId/UUID " + id +" for the value " + csvr.get(headerVal) +", " + e.getLocalizedMessage()); - report.getErrorInfo().add("Unable to set text for the value, " + headerVal + ": "+ csvr.get(headerVal) +", " + e.getMessage()); + errs.add("Unable to set text for the value, " + headerVal + ": "+ csvr.get(headerVal) +", " + e.getMessage()); } } + report.setErrorInfo(errs); } return report; diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/ConstraintsEditElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/ConstraintsEditElement.java index 9a585b40a1a..7f205311238 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/ConstraintsEditElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/ConstraintsEditElement.java @@ -39,7 +39,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte } }catch(BatchEditException e){ - report.getErrorInfo().add(e.getMessage()); + List errs = report.getErrorInfo(); + errs.add(e.getMessage()); + report.setErrorInfo(errs); } diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/ContactEditElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/ContactEditElement.java index 64d93115a46..a5ee46d1bd3 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/ContactEditElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/ContactEditElement.java @@ -90,7 +90,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte } } }catch(BatchEditException e){ - report.getErrorInfo().add(e.getMessage()); + List errs = report.getErrorInfo(); + errs.add(e.getMessage()); + report.setErrorInfo(errs); } } diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/CustomElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/CustomElement.java index 9e14b65bb93..d5cc819c771 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/CustomElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/CustomElement.java @@ -59,7 +59,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte }catch(Exception e){ - report.getErrorInfo().add("Unable to process : " + headerVal + ", exception: " +e.getMessage()); + List errs = report.getErrorInfo(); + errs.add("Unable to process : " + headerVal + ", exception: " +e.getMessage()); + report.setErrorInfo(errs); } } diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/DateEditElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/DateEditElement.java index 97e68a8ebce..283ccb5c289 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/DateEditElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/DateEditElement.java @@ -26,7 +26,6 @@ import org.apache.commons.csv.CSVRecord; import org.fao.geonet.constants.Geonet; import org.fao.geonet.exceptions.BatchEditException; -import org.fao.geonet.utils.Log; import org.jdom.Element; import org.jdom.output.XMLOutputter; import org.jdom.xpath.XPath; @@ -60,7 +59,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte try { rootE = getCitationDateElement(batchEdit, values); } catch (BatchEditException e) { - report.getErrorInfo().add(e.getMessage()); + List errs = report.getErrorInfo(); + errs.add(e.getMessage()); + report.setErrorInfo(errs); } String strEle = out.outputString(rootE); diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/EditElementFactory.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/EditElementFactory.java index d966547baf4..1e3ee1c5e6b 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/EditElementFactory.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/EditElementFactory.java @@ -20,7 +20,6 @@ package org.fao.geonet.kernel.batchedit; import org.fao.geonet.constants.Geonet; -import org.fao.geonet.utils.Log; /** * diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/KeywordEditElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/KeywordEditElement.java index e7723ddead3..94cd420ce96 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/KeywordEditElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/KeywordEditElement.java @@ -68,7 +68,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte rootE = getKeywordElementWithThesaurus(keyword, context, serContext); } catch (BatchEditException e) { - report.getErrorInfo().add(e.getMessage()); + List errs = report.getErrorInfo(); + errs.add(e.getMessage()); + report.setErrorInfo(errs); } if (rootE != null) { diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/MetadataEditElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/MetadataEditElement.java index 5c41bccef6a..6b76aa1757c 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/MetadataEditElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/MetadataEditElement.java @@ -70,7 +70,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte if(headerVal.equalsIgnoreCase(Geonet.EditType.MD_PARENT)) rootE = getMdparentElement(context, serContext, batchEdit, values); } catch (BatchEditException e) { - report.getErrorInfo().add(e.getMessage()); + List errs = report.getErrorInfo(); + errs.add(e.getMessage()); + report.setErrorInfo(errs); } if (rootE != null) { diff --git a/core/src/main/java/org/fao/geonet/kernel/batchedit/OnlineResourceEditElement.java b/core/src/main/java/org/fao/geonet/kernel/batchedit/OnlineResourceEditElement.java index 218f1d2e4a6..d144bb1062d 100644 --- a/core/src/main/java/org/fao/geonet/kernel/batchedit/OnlineResourceEditElement.java +++ b/core/src/main/java/org/fao/geonet/kernel/batchedit/OnlineResourceEditElement.java @@ -82,7 +82,9 @@ public void removeAndAddElement(CSVBatchEdit batchEdit, ApplicationContext conte rootE = additionalInformation(name, desc, linkage, protocol, function); } } catch (BatchEditException e) { - report.getErrorInfo().add(e.getMessage()); + List errs = report.getErrorInfo(); + errs.add(e.getMessage()); + report.setErrorInfo(errs); } if(rootE != null){ diff --git a/core/src/main/java/org/fao/geonet/kernel/search/LuceneConfig.java b/core/src/main/java/org/fao/geonet/kernel/search/LuceneConfig.java index a0ac8db2613..cbf6c07f10a 100644 --- a/core/src/main/java/org/fao/geonet/kernel/search/LuceneConfig.java +++ b/core/src/main/java/org/fao/geonet/kernel/search/LuceneConfig.java @@ -314,7 +314,7 @@ private void load(ServletContext servletContext, String luceneConfigXmlFile) { fieldBoost.put(name, Float.parseFloat(boost)); } catch (Exception exc) { // TODO: handle exception - exc.printStackTrace(); + Log.error(Geonet.SEARCH_ENGINE, "LuceneConfig error: " + exc.getMessage(), exc); } } } @@ -481,8 +481,7 @@ private void loadClassParameters(int type, String field, String clazz, List c } catch (ClassNotFoundException e) { Log.warning(Geonet.SEARCH_ENGINE, " Class not found for parameter: " + name - + ", type: " + paramType); - e.printStackTrace(); + + ", type: " + paramType, e); return; } diff --git a/core/src/main/java/org/fao/geonet/kernel/search/LuceneOptimizerJob.java b/core/src/main/java/org/fao/geonet/kernel/search/LuceneOptimizerJob.java index a6c7fec9715..0a7c420a6b7 100644 --- a/core/src/main/java/org/fao/geonet/kernel/search/LuceneOptimizerJob.java +++ b/core/src/main/java/org/fao/geonet/kernel/search/LuceneOptimizerJob.java @@ -52,8 +52,7 @@ public void execute(JobExecutionContext context) indexTracker.optimize(); } catch (Exception e) { Log.error(Geonet.INDEX_ENGINE, - "Optimize task failed: " + e.getMessage()); - e.printStackTrace(); + "Optimize task failed: " + e.getMessage(), e); } } diff --git a/core/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java b/core/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java index 38eac53227d..cc550a43e74 100644 --- a/core/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java +++ b/core/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java @@ -450,6 +450,8 @@ private static SortField makeSortField(String sortBy, boolean sortOrder, String sortType = SortField.Type.INT; sortBy = "_" + sortBy; } else if (sortBy.equals(Geonet.SearchResult.SortBy.SCALE_DENOMINATOR)) { + sortType = SortField.Type.INT; + } else if (sortBy.equals(Geonet.SearchResult.SortBy.ECATID)) { sortType = SortField.Type.INT; } else if (sortBy.equals(Geonet.SearchResult.SortBy.DATE) || sortBy.equals(Geonet.SearchResult.SortBy.TITLE)) { @@ -1059,13 +1061,13 @@ public static String analyzeText(String field, String requestStr, PerFieldAnalyz } } catch (Exception e) { // TODO why swallow - e.printStackTrace(); + Log.error(Geonet.SEARCH_ENGINE, "analyzeText error:" + e.getMessage(), e); } finally { if (ts != null) { try { ts.close(); } catch (IOException e) { - e.printStackTrace(); + Log.error(Geonet.SEARCH_ENGINE, "analyzeText error closing TokenStream:" + e.getMessage(), e); } } } @@ -1429,6 +1431,11 @@ private void computeQuery(ServiceContext srvContext, Element request, ServiceCon eCatId.setText(eCatId.getText().replace(",", " or ")); } + Element keyword = request.getChild(Geonet.SearchResult.KEYWORD); + if (keyword != null) { + keyword.setText(keyword.getText() + "*"); + } + _summaryConfig = _luceneConfig.getSummaryTypes().get(resultType); final Element summaryItemsEl = request.getChild(Geonet.SearchResult.SUMMARY_ITEMS); @@ -1654,6 +1661,10 @@ private void computeQuery(ServiceContext srvContext, Element request, ServiceCon sortBy = Geonet.SearchResult.SortBy.TITLE; } + if(sortBy.startsWith(Geonet.SearchResult.SortBy.PUBLICATION_DATE)){ + sortBy = Geonet.SearchResult.SortBy.PUBLICATION_DATE; + } + boolean sortOrder = (Util.getParam(request, Geonet.SearchResult.SORT_ORDER, "").equals("")); if (Log.isDebugEnabled(Geonet.SEARCH_ENGINE)) Log.debug(Geonet.SEARCH_ENGINE, "Sorting by : " + sortBy); diff --git a/core/src/main/java/org/fao/geonet/kernel/search/StopwordFileParser.java b/core/src/main/java/org/fao/geonet/kernel/search/StopwordFileParser.java index 2703f9e6c21..8f2f4c5bd32 100644 --- a/core/src/main/java/org/fao/geonet/kernel/search/StopwordFileParser.java +++ b/core/src/main/java/org/fao/geonet/kernel/search/StopwordFileParser.java @@ -84,8 +84,7 @@ public static Set parse(Path filepath) { Log.warning(Geonet.INDEX_ENGINE, "Invalid stopwords file: " + file.toAbsolutePath()); } } catch (IOException x) { - Log.warning(Geonet.INDEX_ENGINE, x.getMessage() + " (this exception is swallowed)"); - x.printStackTrace(); + Log.warning(Geonet.INDEX_ENGINE, x.getMessage() + " (this exception is swallowed)", x); } if (stopwords != null) { if (Log.isDebugEnabled(Geonet.INDEX_ENGINE)) diff --git a/schemas/iso19115-3/src/main/plugin/iso19115-3/formatter/xsl-view/view.xsl b/schemas/iso19115-3/src/main/plugin/iso19115-3/formatter/xsl-view/view.xsl index 88bec2837c7..50b6969573c 100644 --- a/schemas/iso19115-3/src/main/plugin/iso19115-3/formatter/xsl-view/view.xsl +++ b/schemas/iso19115-3/src/main/plugin/iso19115-3/formatter/xsl-view/view.xsl @@ -18,6 +18,7 @@ xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0" + xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" @@ -69,12 +70,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19115-3/src/main/plugin/iso19115-3/index-fields/common.xsl b/schemas/iso19115-3/src/main/plugin/iso19115-3/index-fields/common.xsl index 2d919cf90cb..3b7c08f3b9d 100644 --- a/schemas/iso19115-3/src/main/plugin/iso19115-3/index-fields/common.xsl +++ b/schemas/iso19115-3/src/main/plugin/iso19115-3/index-fields/common.xsl @@ -261,6 +261,21 @@ + + + + + + + + + + + + + + + @@ -270,6 +285,25 @@ + + + + + + + + + + + + + + + + + + + @@ -404,8 +438,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -479,10 +537,10 @@ - - @@ -515,6 +573,12 @@ + + + + + + diff --git a/schemas/iso19115-3/src/main/plugin/iso19115-3/layout/config-view/config-view-source.xml b/schemas/iso19115-3/src/main/plugin/iso19115-3/layout/config-view/config-view-source.xml index 39561ef4371..d14dd0e0b00 100644 --- a/schemas/iso19115-3/src/main/plugin/iso19115-3/layout/config-view/config-view-source.xml +++ b/schemas/iso19115-3/src/main/plugin/iso19115-3/layout/config-view/config-view-source.xml @@ -1,5 +1,5 @@ - - + diff --git a/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-test.xml b/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-dataset.xml similarity index 99% rename from schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-test.xml rename to schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-dataset.xml index f20fa9219cf..014df56a42d 100644 --- a/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-test.xml +++ b/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-dataset.xml @@ -163,7 +163,7 @@ - Digital Object Identifier + Digital Obejct Identifier @@ -269,22 +269,6 @@ geoscientificInformation - - - - - - - - - - - - - - - - @@ -303,6 +287,18 @@ + + + + + + + + + + + + diff --git a/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-source.xml b/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-source.xml index 41607895130..129f5e5669d 100644 --- a/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-source.xml +++ b/schemas/iso19115-3/src/main/plugin/iso19115-3/templates/ga-19115-3-source.xml @@ -126,22 +126,6 @@ geoscientificInformation - - - - - - - - - - - - - - - - @@ -160,6 +144,18 @@ + + + + + + + + + + + + diff --git a/services/src/main/java/org/fao/geonet/api/records/MetadataDownloadApi.java b/services/src/main/java/org/fao/geonet/api/records/MetadataDownloadApi.java index 460599f0ad1..9bba925c06a 100644 --- a/services/src/main/java/org/fao/geonet/api/records/MetadataDownloadApi.java +++ b/services/src/main/java/org/fao/geonet/api/records/MetadataDownloadApi.java @@ -16,9 +16,9 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.concurrent.ForkJoinPool; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.xml.transform.stream.StreamResult; import org.fao.geonet.api.API; @@ -48,10 +48,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.async.DeferredResult; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -63,10 +59,8 @@ @PreAuthorize("permitAll") @RestController public class MetadataDownloadApi implements ApplicationContextAware { - // private static final String SAMPLE_CSV_FILE = "./sample.csv"; + private ApplicationContext appContext; - boolean isDone = false; - public synchronized void setApplicationContext(ApplicationContext context) { this.appContext = context; @@ -78,7 +72,6 @@ public String downloadCSV( @ApiParam(value = ApiParams.API_PARAM_BUCKET_NAME, required = false) @RequestParam(required = false) String bucket, @RequestParam String[] exportParams, HttpServletRequest request) throws Exception { - isDone = false; ServiceContext context = ApiUtils.createServiceContext(request); Map mapParams = new HashMap(); @@ -89,7 +82,7 @@ public String downloadCSV( // return prepareCsv(context, appContext, bucket, mapParams); Path csvPath = Files.createTempFile(sessionId + "metadatas", ".csv"); Runnable task = () -> { - prepareCsv(context, appContext, bucket, mapParams, csvPath); + prepareCsv(context, appContext, bucket, mapParams, csvPath, request.getSession()); }; // start the thread @@ -100,8 +93,10 @@ public String downloadCSV( } public void prepareCsv(ServiceContext srvContext, ApplicationContext context, String bucket, - Map exportParams, Path csvPath) { + Map exportParams, Path csvPath, HttpSession session) { + boolean isDone = false; + session.setAttribute(Geonet.CSV_DOWNLOAD_STATUS, isDone); /*exportParams.entrySet().iterator().forEachRemaining(ep -> { Log.debug(Geonet.SEARCH_ENGINE, "export params values --> " + ep.getKey() + ": " + ep.getValue()); });*/ @@ -173,13 +168,15 @@ public void prepareCsv(ServiceContext srvContext, ApplicationContext context, St Log.error(Geonet.SCHEMA_MANAGER, " Download csv compilation failed, Error is " + e.getMessage()); } finally { isDone = true; + session.setAttribute(Geonet.CSV_DOWNLOAD_STATUS, isDone); } } @RequestMapping(value = "/download/status", method = RequestMethod.GET) public boolean downloadCSVStatus(HttpServletRequest request) throws Exception { - return isDone; + return (boolean) request.getSession().getAttribute(Geonet.CSV_DOWNLOAD_STATUS); + } @RequestMapping(value = "/download/csv", method = RequestMethod.GET, produces = "text/csv") diff --git a/services/src/main/java/org/fao/geonet/api/records/MetadataSearchApi.java b/services/src/main/java/org/fao/geonet/api/records/MetadataSearchApi.java index c961fb7a310..ffe48ea7c85 100644 --- a/services/src/main/java/org/fao/geonet/api/records/MetadataSearchApi.java +++ b/services/src/main/java/org/fao/geonet/api/records/MetadataSearchApi.java @@ -52,10 +52,9 @@ public class MetadataSearchApi { SAXBuilder sb = new SAXBuilder(); + public static final String IS_SEARCHING = "isSearching"; + public static final String SEARCH_RECORDS = "searchRecords"; - private List eCatIds = new ArrayList<>(); - private boolean isSearching = false; - @ApiOperation(value = "Get records by xpath") @RequestMapping(value = "/search/xpath", consumes = { MediaType.APPLICATION_JSON_VALUE }, method = RequestMethod.POST) @@ -64,11 +63,10 @@ public class MetadataSearchApi { public void getMetadataRecordsByXpath(@ApiIgnore HttpServletRequest request, @RequestBody Map allRequestParams) throws Exception { - - isSearching = true; - if(eCatIds != null && eCatIds.size() > 0){ - eCatIds.clear(); - } + List eCatIds = new ArrayList<>(); + request.getSession().setAttribute(IS_SEARCHING, true); + request.getSession().setAttribute(SEARCH_RECORDS, eCatIds); + ServiceContext context = ApiUtils.createServiceContext(request); final MetadataRepository metadataRepository = context.getBean(MetadataRepository.class); @@ -106,7 +104,9 @@ public void getMetadataRecordsByXpath(@ApiIgnore HttpServletRequest request, if (ele != null) { Content eCatId = (Content) _eCatIdPath.selectSingleNode(ele); - eCatIds.add(eCatId.getValue()); + List eList = (List) request.getSession().getAttribute(SEARCH_RECORDS); + eList.add(eCatId.getValue()); + request.getSession().setAttribute(SEARCH_RECORDS, eList); } } catch (JDOMException e) { Log.error(Geonet.SEARCH_ENGINE, "JDOMException: " + e.getMessage()); @@ -117,7 +117,7 @@ public void getMetadataRecordsByXpath(@ApiIgnore HttpServletRequest request, } catch (Exception e) { } finally { - isSearching = false; + request.getSession().setAttribute(IS_SEARCHING, false); } }; // start the thread @@ -138,13 +138,13 @@ public void getMetadataRecordsByXpath(@ApiIgnore HttpServletRequest request, @ResponseStatus(HttpStatus.CREATED) @ResponseBody public boolean getMetadataSearchStatus(@ApiIgnore HttpServletRequest request) throws Exception { - return isSearching; + return (boolean) request.getSession().getAttribute(IS_SEARCHING); } @ApiOperation(value = "Get records by xpath") @RequestMapping(value = "/search/xpath", method = RequestMethod.GET) public @ResponseBody List getMetadataRecords(@ApiIgnore HttpServletRequest request) throws Exception { - return eCatIds; + return (List) request.getSession().getAttribute(SEARCH_RECORDS); } private List query(Map queryFields, HttpServletRequest request) throws JDOMException { diff --git a/services/src/main/java/org/fao/geonet/api/records/editing/BatchEditsApi.java b/services/src/main/java/org/fao/geonet/api/records/editing/BatchEditsApi.java index 7c99ab62733..7daf7439ff8 100644 --- a/services/src/main/java/org/fao/geonet/api/records/editing/BatchEditsApi.java +++ b/services/src/main/java/org/fao/geonet/api/records/editing/BatchEditsApi.java @@ -37,7 +37,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -47,6 +46,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; @@ -87,7 +87,6 @@ import org.fao.geonet.utils.Xml; import org.jdom.Document; import org.jdom.Element; -import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; import org.jdom.xpath.XPath; import org.springframework.beans.factory.annotation.Autowired; @@ -145,15 +144,11 @@ public class BatchEditsApi implements ApplicationContextAware { @Autowired SchemaManager _schemaManager; + private ApplicationContext context; - // List reports; AmazonS3URI s3uri = new AmazonS3URI(Geonet.BATCHEDIT_BACKUP_BUCKET); - List tempBackupData = new ArrayList<>(); Gson g = new Gson(); - double pct; - SimpleMetadataProcessingReport report = new SimpleMetadataProcessingReport(); - public synchronized void setApplicationContext(ApplicationContext context) { this.context = context; } @@ -174,11 +169,13 @@ public IProcessingReport batchEdit( @ApiParam(value = ApiParams.API_PARAM_BUCKET_NAME, required = false) @RequestParam(required = false) String bucket, @RequestBody BatchEditParameter[] edits, HttpServletRequest request) throws Exception { + List listOfUpdates = Arrays.asList(edits); if (listOfUpdates.size() == 0) { throw new IllegalArgumentException("At least one edit must be defined."); } + ServiceContext serviceContext = ApiUtils.createServiceContext(request); final Set setOfUuidsToEdit; if (uuids == null) { @@ -262,24 +259,21 @@ public IProcessingReport batchEdit( @ResponseStatus(HttpStatus.CREATED) @ResponseBody public void batchUpdateUsingCSV(@RequestParam(value = "file") MultipartFile file, - @RequestParam(value = "mode") String mode, @RequestParam(value = "desc") String desc,@RequestParam(value = "backup") boolean backup , HttpServletRequest request) { - + @RequestParam(value = "mode") String mode, @RequestParam(value = "desc") String desc, + @RequestParam(value = "backup") boolean backup , HttpServletRequest request) { + ServiceContext serviceContext = ApiUtils.createServiceContext(request); - if(tempBackupData != null && tempBackupData.size() > 0){ - tempBackupData.clear(); - } + Log.debug(Geonet.SEARCH_ENGINE, "ECAT, BatchEditsApi mode: " + mode); - // File csvFile = new File(file.getOriginalFilename()); try { - clearReport(report); - // csvFile.createNewFile(); + File csvFile = File.createTempFile(file.getOriginalFilename(), "csv"); FileUtils.copyInputStreamToFile(file.getInputStream(), csvFile); Runnable task = () -> { Log.debug(Geonet.SEARCH_ENGINE, "BatchEditAPI calling... startBackupOperation........"); - processCsv(csvFile, context, serviceContext, mode, desc, backup); + processCsv(csvFile, context, serviceContext, mode, desc, backup, request.getSession()); }; // start the thread @@ -287,11 +281,9 @@ public void batchUpdateUsingCSV(@RequestParam(value = "file") MultipartFile file } catch (Exception e) { Log.error(Geonet.SEARCH_ENGINE, "ECAT, BatchEditsApi (C) Stacktrace is\n" + Util.getStackTrace(e)); - report.addError(e); + } - //return report; - } /** @@ -306,6 +298,7 @@ public void batchUpdateUsingCSV(@RequestParam(value = "file") MultipartFile file @ResponseStatus(HttpStatus.CREATED) @ResponseBody public int batchUpdateReport(HttpServletRequest request) { + SimpleMetadataProcessingReport report = (SimpleMetadataProcessingReport) request.getSession().getAttribute(Geonet.BATCHEDIT_REPORT); return report.getNumberOfRecordsProcessed(); } @@ -407,16 +400,19 @@ public void purgeBatchUpdateHistory(HttpServletRequest request) { * @throws Exception */ @SuppressWarnings("unchecked") - public void processCsv(File csvFile, ApplicationContext context, - ServiceContext serviceContext, String mode, String desc, boolean backup) { + private void processCsv(File csvFile, ApplicationContext context, + ServiceContext serviceContext, String mode, String desc, boolean backup, HttpSession session) { + + List backupData = new ArrayList<>(); + SimpleMetadataProcessingReport report = new SimpleMetadataProcessingReport(); + session.setAttribute(Geonet.BATCHEDIT_REPORT, report); + session.setAttribute(Geonet.BATCHEDIT_BACKUP, backupData); // Create folder in s3 bucket with current date Date datetime = new Date(System.currentTimeMillis()); final String dateTimeStr = Geonet.DATE_FORMAT.format(datetime); - - SAXBuilder sb = new SAXBuilder(); // final CSVBatchEdit cbe = context.getBean(CSVBatchEdit.class); CSVBatchEdit cbe = new CSVBatchEdit(context); @@ -437,7 +433,7 @@ public void processCsv(File csvFile, ApplicationContext context, try { // Parse the csv file parser = CSVParser.parse(csvFile, Charset.defaultCharset(), CSVFormat.EXCEL.withHeader()); - // report.setTotalRecords(parser.getRecords().size()); + } catch (IOException e1) { Log.error(Geonet.SEARCH_ENGINE, e1.getMessage()); } @@ -465,14 +461,12 @@ public void processCsv(File csvFile, ApplicationContext context, record = cbe.getMetadataByLuceneSearch(context, serviceContext, request); } catch (BatchEditException e) { report.addMetadataError(id, new Exception(e.getMessage())); - // report.incrementNullRecords(); continue; } } else {// If there is no valid uuid and ecatId, doesn't // process this record and continue to execute next // record report.addError(new Exception("Unable to process record number " + csvr.getRecordNumber())); - // report.incrementNullRecords(); continue; } @@ -489,12 +483,11 @@ record = metadataRepository.findOneByUuid(csvr.get("uuid")); if (record == null) { report.addError(new Exception( "No metadata found, Unable to process record number " + csvr.getRecordNumber())); - // report.incrementNullRecords(); continue; } - if (backup && !saveToS3Bucket(record)) { + if (backup && !saveToS3Bucket(record, session)) { report.addError(new Exception("Unable to backup record uuid/ecat: " + id)); continue; } @@ -512,18 +505,27 @@ record = metadataRepository.findOneByUuid(csvr.get("uuid")); while (iter.hasNext()) { Map.Entry header = (Map.Entry) iter.next(); Log.debug(Geonet.SEARCH_ENGINE, header.getKey() + " - " + header.getValue()); + + try { + if (xpathExpr.containsKey(header.getKey())) { + XPath _xpath = xpathExpr.get(header.getKey()); + + if (_xpath != null) { + BatchEditReport batchreport = cbe.removeOrAddElements(context, serviceContext, header, + csvr, _xpath, document, listOfUpdates, mode); - XPath _xpath = xpathExpr.get(header.getKey()); - - if (_xpath != null) { - BatchEditReport batchreport = cbe.removeOrAddElements(context, serviceContext, header, csvr, - _xpath, document, listOfUpdates, mode); - batchreport.getErrorInfo().stream().forEach(err -> { - report.addMetadataError(id, new Exception(err)); - }); - batchreport.getProcessInfo().stream().forEach(info -> { - report.addMetadataInfos(id, info); - }); + batchreport.getErrorInfo().stream().forEach(err -> { + report.addMetadataError(id, new Exception(err)); + }); + + batchreport.getProcessInfo().stream().forEach(info -> { + report.addMetadataInfos(id, info); + }); + + } + } + } catch (Exception e) { + Log.error(Geonet.SEARCH_ENGINE, "Exception while getting Batch edit report: " + e.getMessage()); } } @@ -546,15 +548,14 @@ record = metadataRepository.findOneByUuid(csvr.get("uuid")); batchEditParam.getXpath(), propertyValue, true); } - - //if (metadataChanged) { - Log.debug(Geonet.SEARCH_ENGINE, "BatchEditsApi --> updating Metadata: " + record.getId()); - dataMan.updateMetadata(serviceContext, record.getId() + "", metadata, false, false, true, "eng", - null, false); - report.addMetadataInfos(id, "Metadata updated, uuid: " + record.getUuid()); - report.incrementProcessedRecords(); - //} - + + Log.debug(Geonet.SEARCH_ENGINE, "BatchEditsApi --> updating Metadata: " + record.getId()); + dataMan.updateMetadata(serviceContext, record.getId() + "", metadata, false, false, true, "eng", + null, false); + report.addMetadataInfos(id, "Metadata updated, uuid: " + record.getUuid()); + report.incrementProcessedRecords(); + session.setAttribute(Geonet.BATCHEDIT_REPORT, report); + } catch (Exception e) { Log.error(Geonet.SEARCH_ENGINE, "Exception :" + e.getMessage()); } @@ -569,7 +570,7 @@ record = metadataRepository.findOneByUuid(csvr.get("uuid")); if(backup){ Log.debug(Geonet.SEARCH_ENGINE, "BatchEditAPI calling... startBackupOperation........"); - startBackupOperation(s3key); + startBackupOperation(s3key, session); } } @@ -585,9 +586,11 @@ public AmazonS3 getS3Client(){ * @param md * @return */ - private boolean saveToS3Bucket(Metadata md) { + private boolean saveToS3Bucket(Metadata md, HttpSession session) { try { - tempBackupData.add(md); + List backupData = (List) session.getAttribute(Geonet.BATCHEDIT_BACKUP); + backupData.add(md); + session.setAttribute(Geonet.BATCHEDIT_BACKUP, backupData); } catch (Exception e) { return false; } @@ -595,7 +598,9 @@ private boolean saveToS3Bucket(Metadata md) { return true; } - public void startBackupOperation(String s3key){ + private void startBackupOperation(String s3key, HttpSession session){ + + Double pct = 0.0; AmazonS3 s3client = getS3Client(); TransferManager xfer_mgr = TransferManagerBuilder @@ -614,8 +619,8 @@ public void startBackupOperation(String s3key){ } Log.debug(Geonet.SEARCH_ENGINE, "BatchEditAPI, tmpDir for backup xml files --->" + tmpDir); - - List files = tempBackupData.stream().map(md -> { + List backupData = (List) session.getAttribute(Geonet.BATCHEDIT_BACKUP); + List files = backupData.stream().map(md -> { try { Path path = Files.createTempFile(tempPath, md.getUuid(), ".xml"); @@ -643,7 +648,8 @@ public void startBackupOperation(String s3key){ //long so_far = progress.getBytesTransferred(); //long total = progress.getTotalBytesToTransfer(); pct = progress.getPercentTransferred(); - progressBackup(); + session.setAttribute(Geonet.BATCHEDIT_PROGRESS, pct); + } while (xfer.isDone() == false); // print the final state of the transfer. TransferState xfer_state = xfer.getState(); @@ -683,14 +689,28 @@ public void startBackupOperation(String s3key){ @ResponseStatus(HttpStatus.CREATED) @ResponseBody public Double batchEditBackup(HttpServletRequest request) { - return progressBackup(); - } - - public Double progressBackup() - { + Double pct = (Double) request.getSession().getAttribute(Geonet.BATCHEDIT_PROGRESS); Log.debug(Geonet.SEARCH_ENGINE, "Percentage transfer: " + pct); return pct; - } + } + + /** + * The service updates records by uploading the csv file + */ + @ApiOperation(value = "Invalidate batchedit attributes.") + @RequestMapping(value = "/batchediting/clear", method = RequestMethod.GET, produces = { + MediaType.APPLICATION_JSON_VALUE }) + @ApiResponses(value = { @ApiResponse(code = 201, message = "Clear batchedit attributes"), + @ApiResponse(code = 403, message = ApiParams.API_RESPONSE_NOT_ALLOWED_CAN_EDIT) }) + @PreAuthorize("hasRole('Administrator')") + @ResponseStatus(HttpStatus.OK) + @ResponseBody + public void clearBatchEditSession(HttpServletRequest request) { + Log.debug(Geonet.SEARCH_ENGINE, "Remove batchedit attributes..."); + request.getSession().removeAttribute(Geonet.BATCHEDIT_BACKUP); + request.getSession().removeAttribute(Geonet.BATCHEDIT_REPORT); + request.getSession().removeAttribute(Geonet.BATCHEDIT_PROGRESS); + } /** * Add batch update entry into database. Converts CustomReport into JSON and stores as StrigClob @@ -755,22 +775,6 @@ private boolean addEntry(SimpleMetadataProcessingReport report, String s3key, Se return true; } - public void clearReport(SimpleMetadataProcessingReport report){ - try{ - report.getInfos().clear(); - report.getErrors().clear(); - report.getMetadata().clear(); - report.getMetadataErrors().clear(); - report.getMetadataInfos().clear(); - report.setTotalRecords(0); - report.processStart(); - report.setNumberOfRecordsProcessed(0); - }catch(Exception e){ - - } - - } - } class CustomReport { diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js index 676dc51ebd5..8f5e85f8c9b 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js @@ -954,8 +954,8 @@ scope.alertMsg = $translate.instant( 'linkToServiceWithoutURLError'); } - - var pidUrl = 'http://pid.geoscience.gov.au/'+md.type[0]+'/ga/'+md.eCatId; + var scopeType = md.type[0] === 'service' ? 'service' : 'dataset'; + var pidUrl = 'http://pid.geoscience.gov.au/'+ scopeType +'/ga/'+md.eCatId; scope.params.url=pidUrl; scope.params.name=md.title; scope.params.code=md.eCatId; @@ -1189,7 +1189,8 @@ if(scope.model.selectedType === scope.selectionType.ECAT_RECORD){ if(scope.metadata){ var md = scope.metadata; - var pidUrl = 'http://pid.geoscience.gov.au/'+md.type[0]+'/ga/'+md.eCatId; + var scopeType = md.type[0] === 'service' ? 'service' : 'dataset'; + var pidUrl = 'http://pid.geoscience.gov.au/'+ scopeType +'/ga/'+md.eCatId; scope.params.url=pidUrl; scope.params._uuid=md.getUuid(); scope.params.protocol='WWW:LINK-1.0-http--link'; diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionService.js b/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionService.js index 33ab26d60ba..27b28be672d 100644 --- a/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionService.js +++ b/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionService.js @@ -503,36 +503,7 @@ }); return defer.promise; }; - - this.getCitation = function(md){ - var citationUrl = ''; - if(angular.isArray(md.author) && md.author.length > 0){ - citationUrl = md.author.join(', ') + ' '; - }else{ - if(md.author){ - citationUrl = md.author + ' '; - } - } - - if(md.publicationDate){ - var date = new Date(md.publicationDate); - citationUrl += date.getFullYear() + '. '; - } - - citationUrl += md.title + '. '; - if(md.issueIdentification){ - citationUrl = citationUrl + 'Record ' + md.issueIdentification + '. '; - } - - citationUrl += 'Geoscience Australia, Canberra. '; - - if(md.DOI){ - citationUrl += md.DOI; - } - - gnUtilityService.getPermalink(md.title || md.defaultTitle, citationUrl); - }; /** * Get html formatter link for the given md * @param {Object} md diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedDirective.js b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedDirective.js index 735f502a7fc..42e29575b5d 100644 --- a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedDirective.js +++ b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedDirective.js @@ -121,7 +121,7 @@ scope.hasAction = function(mainType) { var fn = gnRelatedResources.map[mainType].action; // If function name ends with ToMap do not display the action - if (fn.name.match(/.*ToMap$/) && + if (fn && fn.name.match(/.*ToMap$/) && gnGlobalSettings.isMapViewerEnabled === false) { return false; } @@ -141,7 +141,10 @@ } scope.display = function(r) { - var dis = !r.url.startsWith('file') || (r.url.startsWith('file') && gnGlobalSettings.isIntranet); + var dis = (!r.url.startsWith('http://rmweb/HPEContentManager') + && !r.url.startsWith('file')) + || (r.url.startsWith('file') && gnGlobalSettings.isIntranet) + || (r.url.startsWith('http://rmweb/HPEContentManager') && gnGlobalSettings.isIntranet); return dis; }; diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js index d2009267402..fea0519d0eb 100644 --- a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js +++ b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js @@ -239,7 +239,7 @@ this.map['DEFAULT'].iconClass; }; - this.getLabel = function(mainType, type) { + this.getLabel = function(mainType, type, url) { // Old key before the move to API var oldKey = { hasfeaturecats: 'hasfeaturecat', @@ -248,6 +248,10 @@ fcats: 'fcat', hassources: 'hassource' }; + + if(url.startsWith('http://services.ga.gov.au')){ + return 'Link to Web Services'; + } return this.map[mainType || 'DEFAULT'].label + (oldKey[type] ? oldKey[type] : type); }; diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/partials/related.html b/web-ui/src/main/resources/catalog/components/metadataactions/partials/related.html index c238f8225ab..aef46409f88 100644 --- a/web-ui/src/main/resources/catalog/components/metadataactions/partials/related.html +++ b/web-ui/src/main/resources/catalog/components/metadataactions/partials/related.html @@ -1,10 +1,11 @@
-

{{::title}}

- + +
Download and Links
+
{{::title}} data-ng-class="config.getClassIcon(mainType)"> 
-
+
-

- {{::(r.title | gnLocalized: lang) || r.url}} -

+ {{::(r.title | gnLocalized: lang | characters:50) || r.url}} +

-

0"> - {{::r.description | gnLocalized: lang | striptags | characters:150}} -

+ {{::r.description | gnLocalized: lang | striptags | characters:50}} +

-

- {{::r.title | gnLocalized: lang | striptags | characters:150}} +

+ {{::r.title | gnLocalized: lang | striptags | characters:50}}

-

+

+ data-translate-values="{url:'{{r.url}}', layer:'{{r.title | gnLocalized: lang | characters:50}}'}"> wmsLinkDetails

-

+

+ data-translate-values="{url:'{{r.url}}', layer:'{{r.title | gnLocalized: lang | characters:50}}'}"> wfsLinkDetails

-

+

+ data-translate-values="{url:'{{r.url}}', layer:'{{r.title | gnLocalized: lang | characters:50}}'}"> wcsLinkDetails

-

+

+ data-translate-values="{url:'{{r.url}}', layer:'{{r.title | gnLocalized: lang | characters:50}}'}"> databaseLayerDetails

-

+

+ data-translate-values="{url:'{{r.url}}', name:'{{r.title | gnLocalized: lang | characters:50}}'}"> fileLayerDetails

-

- {{::((r.title | gnLocalized: lang) || (r.description | gnLocalized: lang) || r.url)}} + {{::((r.title | gnLocalized: lang | characters:50) || (r.description | gnLocalized: lang | characters:50) || (r.url | characters:50))}}

-
-
diff --git a/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-category.html b/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-category.html index 292388f1ac8..f14a3d5540d 100644 --- a/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-category.html +++ b/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-category.html @@ -1,34 +1,17 @@ -
    -
  • - - -
    • +
  • + +
    • +
diff --git a/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-list.html b/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-list.html index c7bc064accb..cd1b294953d 100644 --- a/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-list.html +++ b/web-ui/src/main/resources/catalog/components/search/facets/partials/dimension-facet-list.html @@ -1,33 +1,24 @@ -
- - - - - - - - - -
- -

- - {{fLabel | translate}} -

-
-
+
+
+

+ {{fLabel | translate}} + + +

+
+
+
+
+
+
+
+
diff --git a/web-ui/src/main/resources/catalog/components/search/formfields/FormFieldsDirective.js b/web-ui/src/main/resources/catalog/components/search/formfields/FormFieldsDirective.js index c9b26793b80..8e45596faf4 100644 --- a/web-ui/src/main/resources/catalog/components/search/formfields/FormFieldsDirective.js +++ b/web-ui/src/main/resources/catalog/components/search/formfields/FormFieldsDirective.js @@ -87,7 +87,9 @@ var datums = []; for (var i = 0; i < filtered.length; i++) { if (stringValues.indexOf(filtered[i].id) < 0) { - datums.push(filtered[i]); + if(!(filtered[i].id.indexOf('Published_') == 0)){//This is to filter keyword 'Published_Internal' and 'Published_External' + datums.push(filtered[i]); + } } } return datums; diff --git a/web-ui/src/main/resources/catalog/components/search/formfields/SearchSuggestionService.js b/web-ui/src/main/resources/catalog/components/search/formfields/SearchSuggestionService.js index 13a313a8a39..3bc15d79711 100644 --- a/web-ui/src/main/resources/catalog/components/search/formfields/SearchSuggestionService.js +++ b/web-ui/src/main/resources/catalog/components/search/formfields/SearchSuggestionService.js @@ -109,6 +109,15 @@ }); }; + this.getAuthorSuggestions = function(val) { + var url = this.getUrl(val, 'author', + ('STARTSWITHFIRST')); + + return $http.get(url, { + }).then(function(res) { + return res.data[1]; + }); + }; /** * @ngdoc method diff --git a/web-ui/src/main/resources/catalog/components/search/formfields/partials/sortByCombo.html b/web-ui/src/main/resources/catalog/components/search/formfields/partials/sortByCombo.html index 9d5f4013a14..78dd8f88465 100644 --- a/web-ui/src/main/resources/catalog/components/search/formfields/partials/sortByCombo.html +++ b/web-ui/src/main/resources/catalog/components/search/formfields/partials/sortByCombo.html @@ -4,11 +4,10 @@ class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> -   - + class="hidden-xs">sortedBy  +
\ No newline at end of file diff --git a/web-ui/src/main/resources/catalog/components/search/pagination/partials/pagination.html b/web-ui/src/main/resources/catalog/components/search/pagination/partials/pagination.html index f933c659ebc..96f523c4d55 100644 --- a/web-ui/src/main/resources/catalog/components/search/pagination/partials/pagination.html +++ b/web-ui/src/main/resources/catalog/components/search/pagination/partials/pagination.html @@ -1,17 +1,5 @@ -
- +
+ @@ -19,38 +7,34 @@ on {{config.resultsCount}} -
-
-
diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/ResultsviewDirective.js b/web-ui/src/main/resources/catalog/components/search/resultsview/ResultsviewDirective.js index ac5d7b21eef..fc3bb2b8418 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/ResultsviewDirective.js +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/ResultsviewDirective.js @@ -210,16 +210,20 @@ var feat = new ol.Feature(); element.bind('mouseenter', function() { - - var feat = gnMap.getBboxFeatureFromMd(scope.md, + if(scope.map){ + var feat = gnMap.getBboxFeatureFromMd(scope.md, scope.map.getView().getProjection()); if (feat) { scope.hoverOL.getSource().addFeature(feat); } + } + }); element.bind('mouseleave', function() { - scope.hoverOL.getSource().clear(); + if(scope.hoverOL){ + scope.hoverOL.getSource().clear(); + } }); } }; diff --git a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js index a92f0bacc52..51e7f21631a 100644 --- a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js +++ b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js @@ -321,7 +321,6 @@ }; this.resetSearch = function(searchParams) { - $scope.$broadcast('beforeSearchReset'); if (searchParams) { diff --git a/web-ui/src/main/resources/catalog/components/viewer/ViewerModule.js b/web-ui/src/main/resources/catalog/components/viewer/ViewerModule.js index 61b3a90b1ff..6232d0b3cb8 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/ViewerModule.js +++ b/web-ui/src/main/resources/catalog/components/viewer/ViewerModule.js @@ -24,48 +24,6 @@ (function() { goog.provide('gn_viewer'); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - goog.require('gn_baselayerswitcher'); goog.require('gn_draw'); goog.require('gn_featurestable'); diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js index e80b1d33bc1..7fa94423830 100644 --- a/web-ui/src/main/resources/catalog/js/CatController.js +++ b/web-ui/src/main/resources/catalog/js/CatController.js @@ -98,6 +98,7 @@ gnGlobalSettings, $location, gnUtilityService, gnSessionService, gnLangs, gnAdminMenu) { $scope.version = '0.0.1'; + $scope.activeTab = '/home'; //Display or not the admin menu if ($location.absUrl().indexOf('/admin.console') != -1) { $scope.viewMenuAdmin = true; @@ -105,6 +106,8 @@ //Update Links for social media $scope.socialMediaLink = $location.absUrl(); $scope.$on('$locationChangeSuccess', function(event) { + console.log('$location.path() --> ' + $location.path()); + $scope.activeTab = $location.path(); $scope.socialMediaLink = $location.absUrl(); $scope.showSocialMediaLink = ($scope.socialMediaLink.indexOf('/metadata/') != -1); diff --git a/web-ui/src/main/resources/catalog/js/GnAdminMenu.js b/web-ui/src/main/resources/catalog/js/GnAdminMenu.js index 4bf63e9cf54..f6e6e6fc9d3 100644 --- a/web-ui/src/main/resources/catalog/js/GnAdminMenu.js +++ b/web-ui/src/main/resources/catalog/js/GnAdminMenu.js @@ -43,7 +43,7 @@ // TODO : create gn classes {name: 'metadatasAndTemplates', route: '#metadata', classes: 'btn-primary', icon: 'fa-archive'}, - {name: 'harvesters', route: '#harvest', //url: 'harvesting', + {name: 'harvester', route: '#harvest', //url: 'harvesting', classes: 'btn-primary', icon: 'fa-cloud-download'}, {name: 'statisticsAndStatus', route: '#dashboard', classes: 'btn-success', icon: 'fa-dashboard'}, diff --git a/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js b/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js index c2b03874bb0..a9d754d7c97 100644 --- a/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js +++ b/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js @@ -445,6 +445,7 @@ $scope.processRecords = data; if($scope.processRecords === temprecords){ $scope.isCompleted = true; + $http.get('../api/records/batchediting/clear').then(function(response){}); }else{ temprecords = data; } diff --git a/web-ui/src/main/resources/catalog/js/edit/EditorBoardController.js b/web-ui/src/main/resources/catalog/js/edit/EditorBoardController.js index f81cb921694..5cd39d29eff 100644 --- a/web-ui/src/main/resources/catalog/js/edit/EditorBoardController.js +++ b/web-ui/src/main/resources/catalog/js/edit/EditorBoardController.js @@ -53,7 +53,7 @@ hitsperpageValues: gnSearchSettings.hitsperpageValues, selectionBucket: 'e101', params: { - sortBy: 'changeDate', + sortBy: 'publicationDateDesc', _isTemplate: 'y or n or s', resultType: $scope.facetsSummaryType, from: 1, diff --git a/web-ui/src/main/resources/catalog/js/search/SearchController.js b/web-ui/src/main/resources/catalog/js/search/SearchController.js index e7de7c3c749..a908d89ea7c 100644 --- a/web-ui/src/main/resources/catalog/js/search/SearchController.js +++ b/web-ui/src/main/resources/catalog/js/search/SearchController.js @@ -70,7 +70,19 @@ $scope.getAnySuggestions = function(val) { return suggestService.getAnySuggestions(val); }; + $scope.isRecordIndexing = false; + checkIsIndexing(); + function checkIsIndexing() { + // Check if indexing + $http.get('../api/site/indexing').then(function(res) { + $scope.isRecordIndexing = res.data; + }); + } + $scope.checkIndexStatus = function(){ + checkIsIndexing(); + $scope.$broadcast('resetSearch', $scope.searchObj.params); + } $scope.keywordsOptions = { mode: 'remote', remote: { @@ -80,6 +92,10 @@ } }; + $scope.getAuthorSuggestions = function(val) { + return suggestService.getAuthorSuggestions(val); + }; + $scope.orgNameOptions = { mode: 'remote', remote: { @@ -206,7 +222,43 @@ } }); }; - + + $scope.homeSearch = function(){ + var anytext = { + any : $scope.searchObj.params.any + } + $scope.$broadcast('resetSearch', anytext); + } + $scope.searchHomePageItem = function(type){ + var param; + if(type === 'latest_publication'){ + var today = moment(); + var month = today.format('MM'); + var year = today.format('YYYY'); + + var fromDate = moment().subtract(30, 'days'); + var fromMonth = fromDate.format('MM'); + var fromYear = fromDate.format('YYYY'); + var dateFrom = fromYear + '-' + fromMonth + '-' + fromDate.daysInMonth(); + var dateTo = year + '-' + month + '-' + today.daysInMonth(); + param = { + publicationDateFrom: dateFrom, + publicationDateTo: dateTo + } + } + if(type === 'ga_publication'){ + param = { + 'facet.q' : 'keyword/GA Publication' + } + } + if(type === 'edu_products'){ + param = { + 'facet.q' : 'keyword/Educational Product' + } + } + $scope.$broadcast('resetSearch', param); + } + /** * Keep a reference on main cat scope * @return {*} diff --git a/web-ui/src/main/resources/catalog/locales/en-admin.json b/web-ui/src/main/resources/catalog/locales/en-admin.json index 7847127d872..daf98b1ba00 100644 --- a/web-ui/src/main/resources/catalog/locales/en-admin.json +++ b/web-ui/src/main/resources/catalog/locales/en-admin.json @@ -243,6 +243,7 @@ "chooseRecordsToUpdate": "Select records to process", "chooseSourceEditor": "Select editor to transfer records from", "chooseThesaurus": "Choose or drop files here", + "classificationSystems": "Classification Systems", "clearXLinkCache": "Clear XLink cache", "clearJsCache": "Clear JS & CSS cache", "jsCacheCleared": "JS cache cleared. Next page load will trigger cache build.", @@ -529,6 +530,7 @@ "metadataStatus": "Metadata information", "metadataWithIndexingErrors": "Metadata with indexing errors", "metadataErrorReport": "Error report", + "metadatasAndTemplates": "Metadata and Templates", "moreExamples": "More examples", "moreStandardInfo": "More information ...", "mostPopular": "Most popular", @@ -607,6 +609,7 @@ "removeLogo": "Remove logo", "removeStandard": "Remove", "replace": "Replace", + "reports": "Reports", "reportDateCurrentMonth": "Current month", "reportDateCurrentYear": "Current year", "reportDatePreviousMonth": "Previous month", @@ -677,6 +680,7 @@ "serviceFilter": "Filters", "serviceUrl": "Service URL", "set": "Set", + "settings": "Settings", "settingsUpdated": "Settings updated.", "sortTemplate": "Sort metadata templates", "sourceGroup": "Source group", @@ -687,6 +691,7 @@ "standardUrl": "URL to standard ZIP archive", "standards": "Standards", "standardsDeleteError": "Error while deleting standards", + "statisticsAndStatus": "Statistics and Status", "statisticsTablesExport": "Export statistic tables", "status": "Status", "sourceTranslations": "Translate source label", @@ -942,6 +947,7 @@ "thredds-topic": "Topic", "thredds-unidataCfg": "UNIDATA configuration", "time": "Time", + "tools": "Tools", "totalNumberOfRecords": "records in the catalog", "totalNumberOfRecordsHelp": "Total number of records visible to you.", "totalSearches": "Total number of searches", @@ -970,6 +976,7 @@ "useAccount": "Remote authentication", "useLogoForCatalog": "Use it for the node", "useLogoForCatalogFavicon": "Use it for the node favorite icon", + "usersAndGroups":"Users and Groups", "userRecord": " record found for ", "userRecords": " records found for ", "userUpdateError": "User can't be created or updated", diff --git a/web-ui/src/main/resources/catalog/locales/en-core.json b/web-ui/src/main/resources/catalog/locales/en-core.json index cc7ffedd868..8a7ef343f21 100644 --- a/web-ui/src/main/resources/catalog/locales/en-core.json +++ b/web-ui/src/main/resources/catalog/locales/en-core.json @@ -71,6 +71,7 @@ "createAnAccount": "Create an account", "createDateYear": "Creation year", "createDateYears": "Years", + "publicationDateYear": "Publication year", "dataset": "Dataset", "day": "Day", "deleteRecordConfirm": "Do you really want to remove '{{title}}'?", @@ -134,8 +135,8 @@ "ClearTitle": "Clear current search query, filters and sorts.", "hitsPerPage": "Records per page", "chooseRecordsPerPage": "Click to choose the number of records per page", - "sortedBy": "Sorted by {{field}}", - "relevance": "relevancy", + "sortedBy": "Sort by: {{field}}", + "relevance": "relevance", "rating": "rating", "popularity": "popularity", "denominatorDesc": "low scale first", @@ -236,7 +237,7 @@ "sessionIsProbablyCancelled": "Your session was probably canceled on the server!", "sessionAlertDisconnectedMsg": "Last activity was tracked {{startedAt}} and your session has probably expired now (max inactivity time is {{length}}s). You should reload the page and see if your session is still alive or sign in again!", "layersLoading": "Adding layers to the map ...", - "updateStatus": "Update record status", + "updateStatus": "Update status", "resourceContact": "Contact for the resource", "enableWorkflow": "Enable workflow", "metadataStatusUpdatedWithNoErrors": "Record status updated.", @@ -306,7 +307,7 @@ "transfertPrivilegesFinished": "{{metadata}} record(s) transfered.", "valueName": "Name", "xmlView": "XML view", - "downloadRecord": "Download record", + "downloadRecord": "Download metadata", "manageRecord": "Manage record", "valueDefinition": "Definition", "toggleNavigation": "Toggle navigation", diff --git a/web-ui/src/main/resources/catalog/locales/en-search.json b/web-ui/src/main/resources/catalog/locales/en-search.json index 43fbb4c2bac..d4d151b289a 100644 --- a/web-ui/src/main/resources/catalog/locales/en-search.json +++ b/web-ui/src/main/resources/catalog/locales/en-search.json @@ -3,8 +3,7 @@ "clickToRate": "Click to rate", "source": "Catalogue(s)", "title": "Title", - "titleAZ": "Title - A to Z", - "titleZA": "Title - Z to A", + "titleAZ": "Title", "eCatId": "eCat Id", "abstract": "Abstract", "topiccat": "Topic(s)", @@ -111,6 +110,7 @@ "changeDate": "Modified", "changeDateAsc": "Modified (Oldest)", "changeDateDesc": "Modified (Latest)", + "publicationDateDesc": "Publication Date", "links": "Links", "publish": "Publish", "unpublish": "Unpublish", @@ -118,6 +118,7 @@ "Other": "Other", "export": "Export", "exportXML": "Export (XML)", + "exportViewXML": "Export/View (XML)", "exportcheXML": "Export (XML)", "exportGM03": "Export (GM03)", "exportRDF": "Export (RDF)", @@ -137,7 +138,7 @@ "github": "Github", "viewMore": "More", "listOfCategories": "Categories", - "formats": "Formats", + "formats": "Distribution Formats", "addLayers": "Add layers", "serviceUrl": "http://...", "CurrentLayers": "Layers", @@ -206,9 +207,10 @@ "what": "What ?", "when": "When ?", "where": "Where ?", - "resourcesCreatedTheLast": "Resources created in the last", - "recordsCreatedTheLast": "Records created in the last", - "recordsPublishedTheLast": "Records published in the last", + "resourcesCreatedTheLast": "Resources created", + "recordsCreatedTheLast": "Records created", + "temporalExtentPeriod": "Temporal Extent Period", + "recordsPublishedTheLast": "Records published", "today": "today", "yesterday": "yesterday", "thisWeek": "this week", diff --git a/web-ui/src/main/resources/catalog/style/gn.less b/web-ui/src/main/resources/catalog/style/gn.less index 0c02820a20d..e1349359c3d 100644 --- a/web-ui/src/main/resources/catalog/style/gn.less +++ b/web-ui/src/main/resources/catalog/style/gn.less @@ -74,7 +74,7 @@ div[gn-transfer-ownership] * .list-group { */ .gn-top-bar { border-radius: 0px; - padding: 0 20px; + padding: 0 5%; .navbar-collapse { // padding-right: 5px; } @@ -174,37 +174,6 @@ a { left:5px; } -/** - * Logo in nav bar can't be big - */ -.gn-logo { - max-height: 69px; - width:180px !important; -} - -.gn-logo-lg { - width: 160px !important; -} - -.gn-logo-nav { - padding-left: 15px; - span.title-lg { - font: bold 1.2em Helvetica,Arial,Verdana,sans-serif; - padding-left: 50px; - color: #333333; - } -} - -.gn-logo-harvest { - max-height: 69px; - width:25px !important; -} -.ga-line { - width: 100%; - height: 10px; - background-image: url(../catalog/views/default/images/ga-line.jpg); - background-size: contain; -} /** * Properly break stack trace error. */ @@ -578,18 +547,21 @@ i.fa-times.delete:hover { .gn-search-page { .gn-status { - border: 2px solid darken(@brand-info, 5%); + border: 1px solid darken(@brand-info, 5%); position: absolute; - top: 95px; - left: 2px; + min-width: 80px; + z-index: 999; + top: 35px; + right: 5px; + float: right; border-radius: 6px; padding: 2px; - -ms-transform: rotate(-30deg); - -webkit-transform: rotate(-30deg); - transform: rotate(-30deg); + -ms-transform: rotate(25deg); + -webkit-transform: rotate(25deg); + transform: rotate(25deg); color: @brand-info; font-weight: bold; - font-size: 80%; + font-size: 70%; background-color: rgba(255, 255, 255 , 0.7); } .gn-status-mdview { diff --git a/web-ui/src/main/resources/catalog/style/gn_badge_categories.less b/web-ui/src/main/resources/catalog/style/gn_badge_categories.less index 0d9d62b8f37..23fcca7da68 100644 --- a/web-ui/src/main/resources/catalog/style/gn_badge_categories.less +++ b/web-ui/src/main/resources/catalog/style/gn_badge_categories.less @@ -30,13 +30,14 @@ } .badge-text { height: 100%; + width: 300px; line-height: 100%; margin-top: 10px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; a { - color: @badgetext; + color: #fff; cursor: pointer; line-height: normal; .badge { diff --git a/web-ui/src/main/resources/catalog/style/gn_editor.less b/web-ui/src/main/resources/catalog/style/gn_editor.less index af10deac420..a89f386e2cd 100644 --- a/web-ui/src/main/resources/catalog/style/gn_editor.less +++ b/web-ui/src/main/resources/catalog/style/gn_editor.less @@ -103,11 +103,16 @@ input[type=text], input[type=number], select { } .gn-editor-board { + + .gn-results-editor{ + width: 90%; + margin-left: 5%; + } .table.gn-results-editor td { padding: 2px; :nth-of-type(1) { - font-size: 120%; + font-size: 15px; padding-top: 8px; } @@ -577,3 +582,17 @@ form.gn-tab-xml { color: transparent; } } + +.editorboard-menu{ + margin-top: 70px; + .btn-eb{ + color: #fff; + background-color: #006983; + } + +} + + +.btn-block{ + border-radius: 0 !important; +} \ No newline at end of file diff --git a/web-ui/src/main/resources/catalog/style/gn_icons.less b/web-ui/src/main/resources/catalog/style/gn_icons.less index 02a42ecb1a8..c36cbb7950c 100644 --- a/web-ui/src/main/resources/catalog/style/gn_icons.less +++ b/web-ui/src/main/resources/catalog/style/gn_icons.less @@ -9,12 +9,17 @@ .gn-icon-staticMap:before { content: @fa-var-globe } .gn-icon-featureCatalog:before { content: @fa-var-table} .gn-icon-document:before { content: @fa-var-file } +.gn-icon-Document:before { content: @fa-var-file } .gn-icon-attribute:before { content: @fa-var-tag } .gn-icon-attributeType:before { content: @fa-var-sliders } .gn-icon-collectionHardware:before { content: @fa-var-video-camera } .gn-icon-collectionSession:before { content: @fa-var-truck } .gn-icon-series:before { content: @fa-var-files-o } -.gn-icon-nonGeographicDataset:before { content: @fa-var-bar-chart-o } +.gn-icon-nonGeographicDataset:before { content: @fa-var-bar-chart-o } +.gn-icon-product:before { content: @fa-var-tag } +.gn-icon-tile:before { content: @fa-var-square } +.gn-icon-SourceDataset:before { content: @fa-var-bullseye } +.gn-icon-collection:before { content: @fa-var-tags } .gn-icon-dimensionGroup:before { content: @fa-var-star-half-o } .gn-icon-feature:before { content: @fa-var-tag } .gn-icon-featureType:before { content: @fa-var-sitemap } diff --git a/web-ui/src/main/resources/catalog/style/gn_search.less b/web-ui/src/main/resources/catalog/style/gn_search.less index 9761b1dbd52..f17f255dbd0 100644 --- a/web-ui/src/main/resources/catalog/style/gn_search.less +++ b/web-ui/src/main/resources/catalog/style/gn_search.less @@ -86,9 +86,10 @@ /*HOME*/ .search-over { - color: #aaa; + color: #fff; text-align: center; margin-top: 5px; + font-size: 18px; } .gn-form-any { input.input-lg { @@ -130,6 +131,7 @@ span.gn-facet-label { display: inline-block; + cursor: pointer; } .gn-select ul.dropdown-menu > li > a:first-letter, @@ -306,7 +308,7 @@ span.gn-facet-label:first-letter { .collapse-text-toggle { - color: grey; + color: #009fff; } @@ -365,32 +367,9 @@ span.gn-facet-label:first-letter { cursor: pointer; background-color: #428bca; } - .gn-md-edit-btn { - //position: absolute; - //bottom: 0px; - //right: 0px; - //margin: 2px; - //z-index: 10; - //float: right; - } .invisible { display: none; - } - .gn-md-thumbnail { - float:left; - min-width: 80px; - max-width: 140px; - height: 115px; - margin-right: 15px; - //background-image: url(../catalog/views/default/images/no-thumbnail.png); - //border: 1px solid #ddd; - border-radius: 4px; - overflow: hidden; - .gn-img-thumbnail { - margin: 0; - min-height: 100%; - } - } + } } .gn-img-thumbnail-caption { text-align: center; @@ -416,6 +395,10 @@ span.gn-facet-label:first-letter { margin-right: 5px; } +.md-actions{ + padding-left: 5px; +} + [data-ng-search-form], [ng-search-form], .gn-search-page { diff --git a/web-ui/src/main/resources/catalog/templates/admin/admin.html b/web-ui/src/main/resources/catalog/templates/admin/admin.html index 257d011ee42..5be90c30932 100644 --- a/web-ui/src/main/resources/catalog/templates/admin/admin.html +++ b/web-ui/src/main/resources/catalog/templates/admin/admin.html @@ -1,14 +1,14 @@ -
+
- +

{{m.name}}
-
+
latestNews
@@ -34,5 +34,5 @@

{{searchInfo.count}}

-
+
diff --git a/web-ui/src/main/resources/catalog/templates/editor/batchedit.html b/web-ui/src/main/resources/catalog/templates/editor/batchedit.html index bdbf235c1e8..7cac30db5ed 100644 --- a/web-ui/src/main/resources/catalog/templates/editor/batchedit.html +++ b/web-ui/src/main/resources/catalog/templates/editor/batchedit.html @@ -1,3 +1,4 @@ +
  • -
    -
    +
    + +
    + + + +
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    - - - - +
    -
    - + +
    + +
    +
    +
    +
    + + + + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    - -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - -  addRecord - - -  ImportRecord - - -  directoryManager - - -  batchEditing - - -
    - - +
    -
    -
    diff --git a/web-ui/src/main/resources/catalog/templates/editor/import.html b/web-ui/src/main/resources/catalog/templates/editor/import.html index b7bd637082d..c83d53d6de3 100644 --- a/web-ui/src/main/resources/catalog/templates/editor/import.html +++ b/web-ui/src/main/resources/catalog/templates/editor/import.html @@ -1,3 +1,4 @@ +
    diff --git a/web-ui/src/main/resources/catalog/templates/editor/top-toolbar.html b/web-ui/src/main/resources/catalog/templates/editor/top-toolbar.html index 47d0b4ebc42..fbdf1218358 100644 --- a/web-ui/src/main/resources/catalog/templates/editor/top-toolbar.html +++ b/web-ui/src/main/resources/catalog/templates/editor/top-toolbar.html @@ -1,10 +1,8 @@ -