/ - Diff - Metacat - Ecoinformatics Redmine

     import org.apache.solr.response.QueryResponseWriter;
     import org.apache.solr.response.SolrQueryResponse;
     import edu.ucsb.nceas.metacat.common.query.stream.ContentTypeByteArrayInputStream;
     /**
      * Transform the solr QueryReponse to the InputStream. Currently it works only for
      * The EmbeddedSolrServer.
-...
             SolrQueryResponse sResponse = new SolrQueryResponse();
             sResponse.setAllValues(response.getResponse());
             writer.write(results, new LocalSolrQueryRequest(core, request), sResponse);
             return new ByteArrayInputStream(results.toString().getBytes("UTF-8"));
             ContentTypeByteArrayInputStream ctbais = new ContentTypeByteArrayInputStream(results.toString().getBytes("UTF-8"));
             ctbais.setContentType(SolrQueryResponseWriterFactory.getContentType(wt));
             return ctbais;
+        }
+    }

+            }
             return writer;
+        }
     	public static String getContentType(String wt) {
     		String contentType = null;
     		if (wt == null || wt.trim().equals("") || wt.equals(XML)) {
     			contentType = "text/xml";
     		} else if (wt.equals(JSON)) {
     			contentType = "text/json";
     		} else if (wt.equals(PYTHON)) {
     			contentType = "text/plain";
     		} else if (wt.equals(RUBY)) {
     			contentType = "text/plain";
     		} else if (wt.equals(PHP)) {
     			contentType = "text/plain";
     		} else if (wt.equals(PHPS)) {
     			contentType = "text/plain";
     		} else if (wt.equals(VELOCITY)) {
     			contentType = "text/html";
     		} else if (wt.equals(CSV)) {
     			contentType = "text/csv";
     		} else {
     			// just don't know what it is...
     			contentType = null;
+    		}
     		return contentType;
+    	}
+    }

     /**
      *  '$RCSfile$'
      *    Purpose: Interface for associating a content-type with an InputStream
      *  Copyright: 2013 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
      *    Authors: Ben Leinfelder
+     *
      *   '$Author$'
      *     '$Date$'
      * '$Revision$'
+     *
      * This program is free software; you can redistribute it and/or modify
      * it under the terms of the GNU General Public License as published by
      * the Free Software Foundation; either version 2 of the License, or
      * (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
     package edu.ucsb.nceas.metacat.common.query.stream;
     /**
      * Implementations should provide mechanism for identifying the content-type
      * of the java.io.InputStream.
      * The contentType value should be usable in such places as the HTTP Content-Type header
+     *
      * @author leinfelder
+     *
      */
     public interface ContentTypeInputStream {
     	/**
     	 * Retrieve the content-type for the InputStream
     	 * (e.g., "application/octet-stream"
     	 * @return
     	 */
     	public String getContentType();
     	/**
     	 * Set the content-type of the InputStream
     	 * (e.g., "text/xml")
     	 * @param contentType
     	 */
     	public void setContentType(String contentType);
+    }

     /**
      *  '$RCSfile$'
      *    Purpose: ByteArrayInputStream implementation of ContentTypeInputStream
      *    			that allows caller to specify the content-type of the InputStream
      *  Copyright: 2013 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
      *    Authors: Ben Leinfelder
+     *
      *   '$Author$'
      *     '$Date$'
      * '$Revision$'
+     *
      * This program is free software; you can redistribute it and/or modify
      * it under the terms of the GNU General Public License as published by
      * the Free Software Foundation; either version 2 of the License, or
      * (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
     package edu.ucsb.nceas.metacat.common.query.stream;
     import java.io.ByteArrayInputStream;
     /**
      * This class is essentially just a ByteArrayInputStream that provides a mechanism
      * for storing the desired content-type of the InputStream.
      * @author leinfelder
+     *
      */
     public class ContentTypeByteArrayInputStream extends ByteArrayInputStream implements ContentTypeInputStream {
     	private String contentType;
     	public ContentTypeByteArrayInputStream(byte[] buf) {
     		super(buf);
+    	}
     	@Override
     	public String getContentType() {
     		return contentType;
+    	}
     	@Override
     	public void setContentType(String contentType) {
     		this.contentType = contentType;
+    	}
+    }

     import org.jibx.runtime.JiBXException;
     import org.xml.sax.SAXException;
     import edu.ucsb.nceas.metacat.common.query.stream.ContentTypeInputStream;
     import edu.ucsb.nceas.metacat.dataone.MNodeService;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
     	    			mnode.setSession(session);
     	    			InputStream stream = mnode.query(engine, query);
     	    			//response.setContentType("application/octet-stream");
     	    			//response.setContentType("text/xml");
     	    			// set the content-type if we have it from the implementation
     	    			if (stream instanceof ContentTypeInputStream) {
     		    			//response.setContentType("application/octet-stream");
     		    			//response.setContentType("text/xml");
     	    				response.setContentType(((ContentTypeInputStream) stream).getContentType());
+    	    			}
     	                response.setStatus(200);
     	                out = response.getOutputStream();
     	                // write the results to the output stream

     import edu.ucsb.nceas.metacat.McdbDocNotFoundException;
     import edu.ucsb.nceas.metacat.MetaCatServlet;
     import edu.ucsb.nceas.metacat.MetacatHandler;
     import edu.ucsb.nceas.metacat.common.query.stream.ContentTypeByteArrayInputStream;
     import edu.ucsb.nceas.metacat.dataone.hazelcast.HazelcastService;
     import edu.ucsb.nceas.metacat.index.MetacatSolrEngineDescriptionHandler;
     import edu.ucsb.nceas.metacat.index.MetacatSolrIndex;
-...
                 //add the public user subject to the set
                 Subject subject = new Subject();
                 subject.setValue(Constants.SUBJECT_PUBLIC);
                 subjects = new HashSet();
                 subjects = new HashSet<Subject>();
                 subjects.add(subject);
+            }
             //System.out.println("====== user is "+user);
-...
     				DBQuery queryobj = new DBQuery();
     				String results = queryobj.performPathquery(query, user, groups);
     				return new ByteArrayInputStream(results.getBytes(MetaCatServlet.DEFAULT_ENCODING));
     				ContentTypeByteArrayInputStream ctbais = new ContentTypeByteArrayInputStream(results.getBytes(MetaCatServlet.DEFAULT_ENCODING));
     				ctbais.setContentType("text/xml");
     				return ctbais;
     			} catch (Exception e) {
     				throw new ServiceFailure("Pathquery error", e.getMessage());
+    			}
     		} else if (engine != null && engine.equals(MetacatSolrIndex.SOLRQUERY)) {

     import edu.ucsb.nceas.metacat.common.query.SolrQueryResponseWriterFactory;
     import edu.ucsb.nceas.metacat.common.query.SolrQueryService;
     import edu.ucsb.nceas.metacat.common.query.SolrQueryServiceController;
     import edu.ucsb.nceas.metacat.common.query.stream.ContentTypeByteArrayInputStream;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
                         );
                 // finally, get the HTML back
                 inputStream = new ByteArrayInputStream(baos.toByteArray());
                 inputStream = new ContentTypeByteArrayInputStream(baos.toByteArray());
                 ((ContentTypeByteArrayInputStream) inputStream).setContentType("text/html");
+            }
             return inputStream;

Project

General

Profile

Metacat

Revision 7757

Added by ben leinfelder over 11 years ago