Merge pull request #2 from LinkedDataFragments/master

Several corrections

Author: barthanssens

README.md

@@ -49,6 +49,6 @@ If no parameter is set, it looks for a default `config-example.json` in the fold
 ## Status
 This is software is still under development. It currently only supports:
 - HDT data sources
-- Turtle output
+- Turtle, NTriples, JsonLD, RDF/XML output
 
 A [more complete server](https://github.com/LinkedDataFragments/Server.js/) has been implemented for the Node.js platform.

src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java

@@ -143,11 +143,18 @@ private IDataSource getDataSource(HttpServletRequest request) throws IOException
      * @return 
      */
     private String getDatasetUrl(HttpServletRequest request) {
-        String hostName = request.getHeader(HttpHeaders.SERVER);
-        if (hostName == null) {
-            hostName = request.getServerName();
+        if ((request.getServerPort() == 80)
+                || (request.getServerPort() == 443)) {
+            return request.getScheme() + "://"
+                    + request.getServerName()
+                    + request.getRequestURI();
+        } else {
+            return request.getScheme() + "://"
+                    + request.getServerName() + ":" + request.getServerPort()
+                    + request.getRequestURI();
         }
-        return request.getScheme() + "://" + hostName + request.getRequestURI();
+
+        //return request.getScheme() + "://" + hostName + request.getRequestURI();
     }
 
     /**
@@ -258,16 +265,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             // fill the output model
             Model output = fragment.getTriples();
             output.setNsPrefixes(config.getPrefixes());
-            
-            // do conneg
-            String bestMatch = MIMEParse.bestMatch(mimeTypes, request.getHeader("Accept"));
-            Lang contentType = RDFLanguages.contentTypeToLang(bestMatch);
-
-            // serialize the output
-            response.setHeader("Server", "Linked Data Fragments Server");
-            response.setContentType(bestMatch);
-            response.setCharacterEncoding("utf-8");
-            RDFDataMgr.write(response.getOutputStream(), output, contentType);
 
             // add dataset metadata
             String datasetUrl = getDatasetUrl(request);
@@ -283,12 +280,16 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             addPages(output, fragmentId, fragmentUrl, total, limit, offset, page);           
             addControls(output, datasetId, datasetUrl);
 
-            // serialize the output as Turtle
-            response.setHeader(HttpHeaders.SERVER, "Linked Data Fragments Server");
-            response.setContentType("text/turtle");
-            response.setCharacterEncoding(CharEncoding.UTF_8);
+            // do conneg
+            String bestMatch = MIMEParse.bestMatch(mimeTypes, request.getHeader("Accept"));
+            Lang contentType = RDFLanguages.contentTypeToLang(bestMatch);
+
+            // serialize the output
+            response.setHeader("Server", "Linked Data Fragments Server");
+            response.setContentType(bestMatch);
+            response.setCharacterEncoding("utf-8");
 
-            output.write(response.getWriter(), "Turtle", fragmentUrl);
+            RDFDataMgr.write(response.getOutputStream(), output, contentType);
         } catch (IOException | URISyntaxException e) {
             throw new ServletException(e);
         }