Changeset 1907
- Timestamp:
- 04/25/12 08:27:24 (12 years ago)
- Location:
- MDService2/branches/MDService_simple3/src
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/FCSAction.java
r1866 r1907 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.BufferedReader;4 import java.io.ByteArrayInputStream;5 import java.io.File;6 import java.io.IOException;7 import java.io.InputStream;8 import java.io.InputStreamReader;9 import java.io.StringWriter;10 import java.io.UnsupportedEncodingException;11 import java.net.MalformedURLException;12 import java.net.URL;13 3 import java.util.HashMap; 14 4 import java.util.Map; 15 16 import javax.xml.parsers.ParserConfigurationException;17 import javax.xml.transform.TransformerConfigurationException;18 import javax.xml.transform.TransformerException;19 import javax.xml.transform.TransformerFactory;20 import javax.xml.transform.TransformerFactoryConfigurationError;21 import javax.xml.transform.dom.DOMSource;22 import javax.xml.transform.stream.StreamResult;23 24 import org.w3c.dom.Document;25 import org.w3c.dom.Node;26 27 import eu.clarin.cmdi.mdservice.internal.CQLParseException;28 5 import eu.clarin.cmdi.mdservice.internal.Cache; 29 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;30 6 import eu.clarin.cmdi.mdservice.internal.Utils; 31 7 import eu.clarin.cmdi.mdservice.model.Diagnostic; … … 53 29 */ 54 30 55 private String x_content;31 //private String x_content; 56 32 private Map<String,String[]> fcsparams; 57 33 58 private static int OP_SEARCHRETRIEVE = 1;59 private static int OP_EXPLAIN = 2;60 private static int OP_SCAN = 3;34 //private static int OP_SEARCHRETRIEVE = 1; 35 //private static int OP_EXPLAIN = 2; 36 //private static int OP_SCAN = 3; 61 37 62 38 … … 72 48 public String getRepository() { 73 49 if (!getParam("x-context").equals("")){ 74 if (FCSRepositories.getFCSRepositories().getFCSMapping( params.get("x-context")[0]) == null){50 if (FCSRepositories.getFCSRepositories().getFCSMapping(getParam("x-context")) == null){ 75 51 return getParam("x-context"); 76 52 } else { 77 return FCSRepositories.getFCSRepositories().getFCSMapping( params.get("x-context")[0]);53 return FCSRepositories.getFCSRepositories().getFCSMapping(getParam("x-context")); 78 54 } 79 55 } 80 return getParam("x-context");56 return super.getRepository();//getParam("x-context"); 81 57 82 58 } … … 155 131 this.setActionkey("static"); 156 132 } 133 /* 157 134 if (params.get("x-context") != null){ 158 135 … … 166 143 } 167 144 } 168 145 */ 146 /* 147 if (params.get("x-context") != null){ 148 149 // not for scan operation , search in fcs-mapping 150 if (!params.get("operation")[0].equals("scan")){ 151 if (FCSRepositories.getFCSRepositories().getFCSMapping(params.get("x-context")[0]) == null){ 152 addParam("repository",params.get("x-context")[0]); 153 } else { 154 addParam("repository",FCSRepositories.getFCSRepositories().getFCSMapping(params.get("x-context")[0])); 155 } 156 } 157 } 158 */ 169 159 addParam("fullformat",getFullFormat()); 170 160 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java
r1878 r1907 7 7 import java.util.HashMap; 8 8 import java.util.Map; 9 import java.util.Properties;10 import java.util.jar.*;11 9 12 10 import javax.servlet.http.HttpServletRequest; … … 26 24 import eu.clarin.cmdi.mdservice.model.Diagnostic; 27 25 import eu.clarin.cmdi.mdservice.model.Diagnostics; 28 import eu.clarin.cmdi.mdservice.model.Repositories;29 26 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile; 30 27 import eu.clarin.cmdi.mdservice.proxy.ProxyInterface; … … 194 191 195 192 public String getRepository() { 196 return getParam("repository"); 193 //return getParam("repository"); 194 return getParam("x-context"); 197 195 } 198 196 … … 385 383 addParam("maxdepth",params.get("x-cmd-maxdepth")[0]); 386 384 } 387 385 /* 388 386 if ( params.get("x-cmd-repository") == null){ 389 387 if (params.get("repository") == null){ … … 398 396 } else { 399 397 addParam("repository",params.get("x-cmd-repository")[0]); 398 } 399 */ 400 if ( params.get("x-cmd-repository") != null){ 401 addParam("x-context",params.get("x-cmd-repository")[0]); 400 402 } 401 403 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/SRUAction.java
r1852 r1907 57 57 @Override 58 58 public String getRepository() { 59 /* 59 60 if (getParams().get("repository") == null){ 60 61 return getParam("x-cmd-repository"); 61 62 } 62 63 return getParam("repository"); 64 */ 65 if (getParams().get("x-context") == null){ 66 return getParam("x-cmd-repository"); 67 } 68 return getParam("x-context"); 63 69 } 64 70 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r1832 r1907 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.BufferedInputStream;4 import java.io.ByteArrayInputStream;5 import java.io.File;6 import java.io.FileInputStream;7 import java.io.FileWriter;8 3 import java.io.IOException; 9 4 import java.io.InputStream; 10 import java.io.StringWriter; 11 import java.io.UnsupportedEncodingException; 12 import java.net.MalformedURLException; 13 import java.net.URL; 14 import java.text.DateFormat; 15 import java.text.SimpleDateFormat; 16 import java.util.Date; 17 18 import javax.xml.parsers.DocumentBuilder; 19 import javax.xml.parsers.DocumentBuilderFactory; 5 20 6 import javax.xml.parsers.ParserConfigurationException; 21 import javax.xml.transform.OutputKeys;22 import javax.xml.transform.Transformer;23 import javax.xml.transform.TransformerConfigurationException;24 7 import javax.xml.transform.TransformerException; 25 import javax.xml.transform.TransformerFactory;26 8 import javax.xml.transform.TransformerFactoryConfigurationError; 27 import javax.xml.transform.dom.DOMSource;28 import javax.xml.transform.stream.StreamResult;29 import javax.xml.xpath.XPath;30 import javax.xml.xpath.XPathConstants;31 import javax.xml.xpath.XPathExpression;32 9 import javax.xml.xpath.XPathExpressionException; 33 import javax.xml.xpath.XPathFactory;34 35 import net.sf.json.JSON;36 import net.sf.json.JSONObject;37 import net.sf.json.JSONSerializer;38 import net.sf.json.xml.XMLSerializer;39 10 40 11 import org.apache.log4j.Logger; 41 12 import org.w3c.dom.DOMException; 42 import org.w3c.dom.Document;43 import org.w3c.dom.Element;44 import org.w3c.dom.Node;45 import org.w3c.dom.NodeList;46 13 import org.xml.sax.SAXException; 47 14 … … 49 16 import eu.clarin.cmdi.mdservice.internal.Cache; 50 17 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 51 import eu.clarin.cmdi.mdservice.internal.Utils;52 import eu.clarin.cmdi.mdservice.internal.MDTransformer;53 import eu.clarin.cmdi.mdservice.model.Diagnostic;54 import eu.clarin.cmdi.mdservice.model.Query;55 18 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile; 56 import eu.clarin.cmdi.mdservice.proxy.FCSProxy;57 19 import eu.clarin.cmdi.mdservice.proxy.WorkspaceProxy; 58 20 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/FCSRepositories.java
r1833 r1907 1 1 package eu.clarin.cmdi.mdservice.model; 2 2 3 import java.io.BufferedInputStream;4 import java.io.ByteArrayInputStream;5 import java.io.File;6 import java.io.FileInputStream;7 import java.io.FileWriter;8 3 import java.io.IOException; 9 4 import java.io.InputStream; 10 import java.io.StringWriter;11 import java.io.UnsupportedEncodingException;12 import java.net.URL;13 import java.text.DateFormat;14 import java.text.SimpleDateFormat;15 import java.util.Date;16 5 import java.util.HashMap; 17 18 import javax.xml.namespace.QName;19 6 import javax.xml.parsers.DocumentBuilder; 20 7 import javax.xml.parsers.DocumentBuilderFactory; 21 8 import javax.xml.parsers.ParserConfigurationException; 22 import javax.xml.transform.OutputKeys;23 import javax.xml.transform.Transformer;24 9 import javax.xml.transform.TransformerConfigurationException; 25 10 import javax.xml.transform.TransformerException; 26 import javax.xml.transform.TransformerFactory;27 11 import javax.xml.transform.TransformerFactoryConfigurationError; 28 import javax.xml.transform.dom.DOMSource;29 import javax.xml.transform.stream.StreamResult;30 import javax.xml.xpath.XPath;31 import javax.xml.xpath.XPathConstants;32 import javax.xml.xpath.XPathExpression;33 import javax.xml.xpath.XPathExpressionException;34 import javax.xml.xpath.XPathFactory;35 36 import org.w3c.dom.DOMException;37 12 import org.w3c.dom.Document; 38 13 import org.w3c.dom.Element; … … 41 16 import org.xml.sax.SAXException; 42 17 43 import net.sf.json.JSON;44 import net.sf.json.JSONArray;45 import net.sf.json.JSONObject;46 import net.sf.json.JSONSerializer;47 import net.sf.json.xml.XMLSerializer;48 18 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 49 19 import eu.clarin.cmdi.mdservice.internal.Utils; 50 20 import eu.clarin.cmdi.mdservice.action.FCSAction; 51 import eu.clarin.cmdi.mdservice.action.WorkspaceAction;52 21 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 53 22 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Options.java
r1833 r1907 1 1 package eu.clarin.cmdi.mdservice.model; 2 2 3 import java.io.BufferedInputStream;4 import java.io.ByteArrayInputStream;5 import java.io.File;6 import java.io.FileInputStream;7 import java.io.FileWriter;8 import java.io.IOException;9 3 import java.io.InputStream; 10 import java.io.StringWriter;11 import java.io.UnsupportedEncodingException;12 import java.net.URL;13 import java.text.DateFormat;14 import java.text.SimpleDateFormat;15 import java.util.Date;16 import java.util.HashMap;17 18 import javax.xml.namespace.QName;19 import javax.xml.parsers.DocumentBuilder;20 import javax.xml.parsers.DocumentBuilderFactory;21 import javax.xml.parsers.ParserConfigurationException;22 import javax.xml.transform.OutputKeys;23 import javax.xml.transform.Transformer;24 4 import javax.xml.transform.TransformerConfigurationException; 25 5 import javax.xml.transform.TransformerException; 26 import javax.xml.transform.TransformerFactory;27 6 import javax.xml.transform.TransformerFactoryConfigurationError; 28 import javax.xml.transform.dom.DOMSource;29 import javax.xml.transform.stream.StreamResult;30 import javax.xml.xpath.XPath;31 7 import javax.xml.xpath.XPathConstants; 32 import javax.xml.xpath.XPathExpression;33 8 import javax.xml.xpath.XPathExpressionException; 34 import javax.xml.xpath.XPathFactory;35 36 import org.w3c.dom.DOMException;37 import org.w3c.dom.Document;38 import org.w3c.dom.Element;39 import org.w3c.dom.Node;40 9 import org.w3c.dom.NodeList; 41 import org.xml.sax.SAXException;42 43 import net.sf.json.JSON;44 import net.sf.json.JSONArray;45 import net.sf.json.JSONObject;46 import net.sf.json.JSONSerializer;47 import net.sf.json.xml.XMLSerializer;48 import eu.clarin.cmdi.mdservice.internal.MDTransformer;49 10 import eu.clarin.cmdi.mdservice.internal.Utils; 50 import eu.clarin.cmdi.mdservice.action.FCSAction;51 import eu.clarin.cmdi.mdservice.action.WorkspaceAction;52 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;53 11 54 12 /** -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Query.java
r1800 r1907 13 13 import java.io.IOException; 14 14 import java.net.MalformedURLException; 15 import java.net.URL;16 15 import java.util.HashMap; 17 16 import java.util.Iterator; -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Repositories.java
r1852 r1907 1 1 package eu.clarin.cmdi.mdservice.model; 2 2 3 import java.io.BufferedInputStream;4 import java.io.ByteArrayInputStream;5 import java.io.File;6 import java.io.FileInputStream;7 import java.io.FileWriter;8 import java.io.IOException;9 3 import java.io.InputStream; 10 import java.io.StringWriter;11 import java.io.UnsupportedEncodingException;12 import java.net.URL;13 import java.text.DateFormat;14 import java.text.SimpleDateFormat;15 import java.util.Date;16 import java.util.HashMap;17 4 18 5 import javax.xml.namespace.QName; 19 import javax.xml.parsers.DocumentBuilder;20 import javax.xml.parsers.DocumentBuilderFactory;21 import javax.xml.parsers.ParserConfigurationException;22 import javax.xml.transform.OutputKeys;23 import javax.xml.transform.Transformer;24 6 import javax.xml.transform.TransformerConfigurationException; 25 7 import javax.xml.transform.TransformerException; 26 import javax.xml.transform.TransformerFactory;27 8 import javax.xml.transform.TransformerFactoryConfigurationError; 28 import javax.xml.transform.dom.DOMSource;29 import javax.xml.transform.stream.StreamResult;30 9 import javax.xml.xpath.XPath; 31 10 import javax.xml.xpath.XPathConstants; … … 34 13 import javax.xml.xpath.XPathFactory; 35 14 36 import org.w3c.dom.DOMException;37 15 import org.w3c.dom.Document; 38 import org.w3c.dom.Element;39 16 import org.w3c.dom.Node; 40 17 import org.w3c.dom.NodeList; 41 import org.xml.sax.SAXException;42 43 import net.sf.json.JSON;44 import net.sf.json.JSONArray;45 import net.sf.json.JSONObject;46 import net.sf.json.JSONSerializer;47 import net.sf.json.xml.XMLSerializer;48 import eu.clarin.cmdi.mdservice.internal.MDTransformer;49 18 import eu.clarin.cmdi.mdservice.internal.Utils; 50 import eu.clarin.cmdi.mdservice.action.FCSAction;51 import eu.clarin.cmdi.mdservice.action.WorkspaceAction;52 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;53 19 54 20 /** -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Termsets.java
r1832 r1907 1 1 package eu.clarin.cmdi.mdservice.model; 2 2 3 import java.io.BufferedInputStream;4 import java.io.ByteArrayInputStream;5 import java.io.File;6 import java.io.FileInputStream;7 import java.io.FileWriter;8 import java.io.IOException;9 3 import java.io.InputStream; 10 import java.io.StringWriter;11 import java.io.UnsupportedEncodingException;12 import java.net.URL;13 import java.text.DateFormat;14 import java.text.SimpleDateFormat;15 import java.util.Date;16 import java.util.HashMap;17 18 import javax.xml.namespace.QName;19 import javax.xml.parsers.DocumentBuilder;20 import javax.xml.parsers.DocumentBuilderFactory;21 import javax.xml.parsers.ParserConfigurationException;22 import javax.xml.transform.OutputKeys;23 import javax.xml.transform.Transformer;24 4 import javax.xml.transform.TransformerConfigurationException; 25 5 import javax.xml.transform.TransformerException; 26 import javax.xml.transform.TransformerFactory;27 6 import javax.xml.transform.TransformerFactoryConfigurationError; 28 import javax.xml.transform.dom.DOMSource;29 import javax.xml.transform.stream.StreamResult;30 import javax.xml.xpath.XPath;31 7 import javax.xml.xpath.XPathConstants; 32 import javax.xml.xpath.XPathExpression;33 8 import javax.xml.xpath.XPathExpressionException; 34 import javax.xml.xpath.XPathFactory;35 36 import org.w3c.dom.DOMException;37 import org.w3c.dom.Document;38 import org.w3c.dom.Element;39 import org.w3c.dom.Node;40 9 import org.w3c.dom.NodeList; 41 import org.xml.sax.SAXException;42 43 import net.sf.json.JSON;44 import net.sf.json.JSONArray;45 import net.sf.json.JSONObject;46 import net.sf.json.JSONSerializer;47 import net.sf.json.xml.XMLSerializer;48 import eu.clarin.cmdi.mdservice.internal.MDTransformer;49 10 import eu.clarin.cmdi.mdservice.internal.Utils; 50 import eu.clarin.cmdi.mdservice.action.FCSAction;51 import eu.clarin.cmdi.mdservice.action.WorkspaceAction;52 import eu.clarin.cmdi.mdservice.action.WorkspaceAction_old;53 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;54 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile_old.RepositoryType;55 11 56 12 /** -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/BasicProxy.java
r1654 r1907 13 13 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 14 14 import eu.clarin.cmdi.mdservice.internal.Utils; 15 import eu.clarin.cmdi.mdservice.model.Diagnostic;16 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;17 15 18 16 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/FCSProxy.java
r1874 r1907 6 6 7 7 import org.apache.log4j.Logger; 8 9 import eu.clarin.cmdi.mdservice.action.WorkspaceRepositoryAction;10 8 import eu.clarin.cmdi.mdservice.internal.CQLParseException; 11 9 import eu.clarin.cmdi.mdservice.model.Diagnostic; 12 import eu.clarin.cmdi.mdservice.model.Diagnostics;13 10 import eu.clarin.cmdi.mdservice.model.FCSRepositories; 14 11 import eu.clarin.cmdi.mdservice.model.Query; 15 12 import eu.clarin.cmdi.mdservice.model.Repositories; 16 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;17 13 18 14 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/LocalProxy.java
r1628 r1907 5 5 6 6 import org.apache.log4j.Logger; 7 8 import eu.clarin.cmdi.mdservice.model.Diagnostic;9 7 10 8 /** -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/MDRepoProxy.java
r1832 r1907 1 1 package eu.clarin.cmdi.mdservice.proxy; 2 2 3 import java.io.ByteArrayInputStream;4 3 import java.io.IOException; 5 import java.io.UnsupportedEncodingException;6 4 import java.net.URL; 7 5 import java.util.HashMap; 8 9 import net.sf.json.xml.XMLSerializer;10 6 11 7 import org.apache.log4j.Logger; 12 8 13 9 import eu.clarin.cmdi.mdservice.internal.CQLParseException; 14 import eu.clarin.cmdi.mdservice.internal.Cache;15 import eu.clarin.cmdi.mdservice.model.Diagnostic;16 10 import eu.clarin.cmdi.mdservice.model.Query; 17 11 import eu.clarin.cmdi.mdservice.model.Repositories; 18 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;19 12 20 13 /** -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/ProxyInterface.java
r1569 r1907 3 3 import java.io.IOException; 4 4 import java.io.InputStream; 5 import java.net.MalformedURLException;6 5 import java.net.URL; 7 6 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/RepoProxy.java
r1832 r1907 5 5 import java.net.MalformedURLException; 6 6 import java.net.URL; 7 import java.net.URLConnection;8 import java.util.Map;9 10 7 import org.apache.log4j.Logger; 11 8 … … 17 14 import eu.clarin.cmdi.mdservice.model.Query; 18 15 import eu.clarin.cmdi.mdservice.model.Repositories; 19 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;20 16 21 17 /** … … 83 79 //super.checkParams(); 84 80 // check and set defaults 81 /* 85 82 if (Repositories.getRepositories().getRepositoryPath(getParam("repository")) == null) { 86 83 getSourceAction().getDiagnostics().Add(Diagnostic.UNSUPPORTED_PARAMETERVALUE, "repository"); 87 84 } 88 85 if (getParam("repository")=="") { 86 getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "repository"); 87 } 88 */ 89 if (Repositories.getRepositories().getRepositoryPath(getParam("x-context")) == null) { 90 getSourceAction().getDiagnostics().Add(Diagnostic.UNSUPPORTED_PARAMETERVALUE, "repository"); 91 } 92 if (getParam("x-context")=="") { 89 93 getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "repository"); 90 94 } -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/SRUProxy.java
r1832 r1907 10 10 import eu.clarin.cmdi.mdservice.model.Query; 11 11 import eu.clarin.cmdi.mdservice.model.Repositories; 12 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;13 14 12 15 13 public class SRUProxy extends RepoProxy -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/WorkspaceProxy.java
r1832 r1907 3 3 import java.io.IOException; 4 4 import java.io.InputStream; 5 import java.net.MalformedURLException;6 5 import java.net.URL; 7 import java.net.URLConnection;8 import java.util.Map;9 6 10 7 import javax.xml.transform.TransformerConfigurationException; … … 14 11 15 12 import org.apache.log4j.Logger; 16 import org.w3c.dom.NodeList;17 18 import eu.clarin.cmdi.mdservice.action.GenericAction;19 13 import eu.clarin.cmdi.mdservice.internal.CQLParseException; 20 14 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 21 import eu.clarin.cmdi.mdservice.internal.Utils;22 import eu.clarin.cmdi.mdservice.model.Diagnostic;23 import eu.clarin.cmdi.mdservice.model.Diagnostics;24 15 import eu.clarin.cmdi.mdservice.model.Options; 25 16 import eu.clarin.cmdi.mdservice.model.Repositories; -
MDService2/branches/MDService_simple3/src/xsl/cmd_commons.xsl
r1651 r1907 15 15 16 16 <xsl:include href="cmd_functions.xsl"/> 17 <xsl:include href=" html_snippets.xsl"/>17 <xsl:include href="./fcs/html_snippets.xsl"/> 18 18 19 19 <xsl:param name="src_file" /> … … 90 90 <head> 91 91 <title><xsl:value-of select="$title"/></title> 92 <link href="{$ base_dir}/style/cmds-ui.css" type="text/css" rel="stylesheet"></link>92 <link href="{$scripts_url}/style/cmds-ui.css" type="text/css" rel="stylesheet"></link> 93 93 94 94 <!-- <xsl:call-template name="callback-header"/> --> -
MDService2/branches/MDService_simple3/src/xsl/cmd_functions.xsl
r1637 r1907 10 10 11 11 --> 12 <xsl:include href=" params.xsl"/>12 <xsl:include href="./fcs/params.xsl"/> 13 13 14 14 <!-- <xsl:param name="mode" select="'html'" /> --> … … 16 16 <xsl:param name="dict_file" select="'dict.xml'" /> 17 17 <xsl:variable name="dict" select="document($dict_file)" /> 18 <xsl:variable name="terms_setup" select="document($terms_setup_uri)" /> 19 <xsl:variable name="terms_flat" select="document($terms_flat_uri)" /> 18 <!-- 19 <xsl:variable name="terms_setup" select="document($terms_setup_uri)" /> 20 <xsl:variable name="terms_flat" select="document($terms_flat_uri)" /> 21 --> 22 <xsl:variable name="terms_setup" select="document('')" /> 23 <xsl:variable name="terms_flat" select="document('')" /> 24 20 25 21 26 <!-- params for include-processing … … 92 97 <!-- <xsl:message>cmdprofiles_uri: <xsl:value-of select="$cmdprofiles_uri" /></xsl:message> --> 93 98 94 <xsl:variable name="profile" select="doc($cmdprofiles_uri)//profileDescription[name=$term]" /> 99 <!-- <xsl:variable name="profile" select="doc($cmdprofiles_uri)//profileDescription[name=$term]" /> --> 100 <xsl:variable name="profile" select="doc('')//profileDescription[name=$term]" /> 95 101 96 102 <xsl:choose> … … 136 142 <xsl:function name="my:extractID" > 137 143 <xsl:param name="uri" /> 138 144 <!-- 139 145 <xsl:choose> 140 146 <xsl:when test="contains($uri,$isocat_base_uri)"> 141 147 <xsl:value-of select="substring-after($uri, $isocat_base_uri)" /> 148 <xsl:value-of select="substring-after($uri, '')" /> 142 149 </xsl:when> 143 150 <xsl:when test="contains($uri,$components_id_prefix)"> 144 <!-- <xsl:value-of select="substring-after($uri,$components_id_prefix)" /> --> 145 <xsl:value-of select="substring-after($uri, $components_id_prefix)" /> 151 <xsl:value-of select="substring-after($uri,$components_id_prefix)" /> 146 152 </xsl:when> 147 153 <xsl:otherwise><xsl:value-of select="$uri" /></xsl:otherwise> 148 </xsl:choose> 154 </xsl:choose> 155 --> 149 156 </xsl:function> 150 157 … … 165 172 --> 166 173 <xsl:function name="my:rewriteURL" > 167 <xsl:param name="url" /> 174 <xsl:param name="url" /> 175 <!-- 168 176 <xsl:choose> 169 177 <xsl:when test="contains($url,$isocat_base_uri)"> … … 171 179 </xsl:when> 172 180 <xsl:otherwise><xsl:value-of select="concat($detail_complist_prefix, my:extractID($url))" /></xsl:otherwise> 173 </xsl:choose> 181 </xsl:choose> 182 --> 174 183 </xsl:function> 175 184 … … 189 198 </xsl:variable> 190 199 <xsl:variable name="param_repository"> 191 <xsl:if test="$ repository!= ''">192 <xsl:value-of select="concat('&repository=',$ repository)"></xsl:value-of>200 <xsl:if test="$x-context != ''"> 201 <xsl:value-of select="concat('&repository=',$x-context)"></xsl:value-of> 193 202 </xsl:if> 194 203 </xsl:variable> … … 207 216 <xsl:choose> 208 217 <xsl:when test="$action=''"> 209 <xsl:value-of select="concat($base_ dir, '/?q=', $q, '&repository=', $repository)" />218 <xsl:value-of select="concat($base_url, '/?q=', $q, '&x-context=', $x-context)" /> 210 219 </xsl:when> 211 220 <xsl:when test="$q=''"> 212 <xsl:value-of select="concat($base_ dir, '/',$action, '/', $format)" />221 <xsl:value-of select="concat($base_url, '/',$action, '/', $format)" /> 213 222 </xsl:when> 214 223 <xsl:otherwise> 215 224 <xsl:choose> 216 225 <xsl:when test="$action='record'"> 217 <xsl:value-of select="concat($base_ dir, '/',$action, '/', $format, '?query=', $q, $param_repository)" />226 <xsl:value-of select="concat($base_url, '/',$action, '/', $format, '?query=', $q, $param_repository)" /> 218 227 </xsl:when> 219 228 <xsl:otherwise> 220 <xsl:value-of select="concat($base_ dir, '/',$action, '/', $format, '?query=', $q, $param_repository, $param_startRecord, $param_maximumRecords)" />229 <xsl:value-of select="concat($base_url, '/',$action, '/', $format, '?query=', $q, $param_repository, $param_startRecord, $param_maximumRecords)" /> 221 230 </xsl:otherwise> 222 231 </xsl:choose> … … 231 240 <xsl:param name="maximumRecords" /> 232 241 233 <xsl:variable name="searchurl" select="concat($base_ dir, '/search/', $format, '?')" />242 <xsl:variable name="searchurl" select="concat($base_url, '/search/', $format, '?')" /> 234 243 <xsl:variable name="param_query"> 235 244 <xsl:if test="$q != ''"> … … 238 247 </xsl:variable> 239 248 <xsl:variable name="param_repository"> 240 <xsl:if test="$ repository!= ''">241 <xsl:value-of select="concat('& repository=',$repository)"></xsl:value-of>249 <xsl:if test="$x-context != ''"> 250 <xsl:value-of select="concat('&x-context=',$x-context)"></xsl:value-of> 242 251 </xsl:if> 243 252 </xsl:variable> -
MDService2/branches/MDService_simple3/src/xsl/fcs/html_snippets.xsl
r1787 r1907 10 10 --> 11 11 <xsl:import href="params.xsl"/> 12 12 13 <xsl:template name="html-head"> 13 14 <title> … … 34 35 <div id="top-menu"> 35 36 <div id="user"> 36 <xsl:variable name="link_toggle_js"> 37 <xsl:variable name="link_toggle_js" select="''"> 38 <!-- 37 39 <xsl:call-template name="formURL"> 38 40 <xsl:with-param name="format"> … … 43 45 </xsl:with-param> 44 46 </xsl:call-template> 47 --> 48 45 49 </xsl:variable> 46 50 <xsl:choose> … … 176 180 </xsl:choose> 177 181 </xsl:variable> 178 <xsl:variable name="link_prev"> 182 <xsl:variable name="link_prev" select="''"> 183 <!-- 179 184 <xsl:call-template name="formURL"> 180 185 <xsl:with-param name="startRecord" select="$prev_startRecord"/> 181 186 <xsl:with-param name="maximumRecords" select="$maximumRecords"/> 182 </xsl:call-template> 187 </xsl:call-template> 188 --> 189 183 190 </xsl:variable> 184 191 <a class="internal prev" href="{$link_prev}"> … … 199 206 </span> 200 207 </a> 201 <xsl:variable name="link_next"> 208 <xsl:variable name="link_next" select="''"> 209 <!-- 202 210 <xsl:call-template name="formURL"> 203 211 <xsl:with-param name="startRecord" select="$next_startRecord"/> 204 212 <xsl:with-param name="maximumRecords" select="$maximumRecords"/> 205 </xsl:call-template> 213 </xsl:call-template> 214 --> 215 206 216 </xsl:variable> 207 217 <a class="internal next" href="{$link_next}"> -
MDService2/branches/MDService_simple3/src/xsl/fcs/params.xsl
r1848 r1907 21 21 <xsl:param name="scanClause" select="''"/> 22 22 <xsl:param name="contexts_url" select="concat($base_url,'?operation=scan&scanClause=fcs.resource&sort=text')"/> 23 24 25 <!-- gs --> 26 <xsl:param name="name_element" select="('title', 'name', 'resourcename', 'md-title')" /> 27 23 28 </xsl:transform> -
MDService2/branches/MDService_simple3/src/xsl/mdset2view.xsl
r1637 r1907 167 167 </xsl:attribute></input></span> 168 168 169 <xsl:if test="$ repository!= ''">169 <xsl:if test="$x-context != ''"> 170 170 <input type="hidden" name="repository"><xsl:attribute name="value"> 171 <xsl:value-of select="$ repository"/>171 <xsl:value-of select="$x-context"/> 172 172 </xsl:attribute> 173 173 </input> … … 422 422 <xsl:choose> 423 423 <xsl:when test="contains($format, 'htmlsimple')" > 424 <a class="internal" href="{concat('../../record/htmldetail/', my:encodePID(.//MdSelfLink), '? repository=', $repository)}" >424 <a class="internal" href="{concat('../../record/htmldetail/', my:encodePID(.//MdSelfLink), '?x-context=', $x-context)}" > 425 425 <xsl:value-of select="$absolute_position" /> 426 426 </a> -
MDService2/branches/MDService_simple3/src/xsl/model2matrix.xsl
r1637 r1907 42 42 </xsl:when> 43 43 <xsl:when test="$termset_name='Components'" > 44 <xsl:message>model2matrix.Components.repo_name: <xsl:value-of select="$ repository" /></xsl:message>44 <xsl:message>model2matrix.Components.repo_name: <xsl:value-of select="$x-context" /></xsl:message> 45 45 <!-- get the whole Termset for every root-node (teiHeader, TCP, ...) --> 46 46 <Termsets> … … 62 62 <!-- else get the full summary for given termset --> 63 63 <xsl:otherwise> 64 <xsl:variable name="resolved_termset_uri" select="concat($model_matrix_uri,$termset_name,'&maxdepth=8& repository=',$repository)" />64 <xsl:variable name="resolved_termset_uri" select="concat($model_matrix_uri,$termset_name,'&maxdepth=8&x-context=',$x-context)" /> 65 65 <xsl:message>processing model-term($resolved_termset_uri): <xsl:value-of select="$resolved_termset_uri" /> </xsl:message> 66 66 <xsl:copy-of select="document($resolved_termset_uri)" /> … … 134 134 <xsl:template name="full-matrix" > 135 135 <!-- collect all model termMatrix --> 136 <xsl:variable name="model_termsets_uri" select="concat($model_matrix_uri,'Components', '&maxdepth=1& repository=',$repository)" />136 <xsl:variable name="model_termsets_uri" select="concat($model_matrix_uri,'Components', '&maxdepth=1&x-context=',$x-context)" /> 137 137 <xsl:message>full-matrix.model_termsets_uri: <xsl:value-of select="$model_termsets_uri"/> </xsl:message> 138 138 <xsl:variable name="model_termsets" select="document($model_termsets_uri)" /> -
MDService2/branches/MDService_simple3/src/xsl/static2view.xsl
r1848 r1907 59 59 <xsl:choose> 60 60 <xsl:when test="@class='request count'"> 61 <xsl:copy-of select="concat($base_url,@href)" /> 61 <xsl:copy-of select="concat($base_url,@href)" /> 62 62 </xsl:when> 63 63 <xsl:when test="@class='query count'">
Note: See TracChangeset
for help on using the changeset viewer.