- If you are a member of the Cornell community and would like to edit you profile
- in the Vivo system please login using your netId.
-
-
-
-
-
-
-
-
diff --git a/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl b/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
index 12c75be1..dbab2238 100644
--- a/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
+++ b/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
@@ -2,37 +2,31 @@
<#-- Page providing options for disseminating QR codes -->
-<#include "individual-qrCodeFoafPerson.ftl">
+<#include "individual-qrCodeGenerator.ftl">
<#assign qrCodeWidth = "150">
-
-
-
-
-
- Export QR Code
-
-
+
- <#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" >
- 
-
-
-
-
-${individual.nameStatement.value}
-Export QR Code (What is this?)
-
-
+
+
+
+
-VCard
+<#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" > +${individual.nameStatement.value}
+ +VCard
<@qrCodeVCard qrCodeWidth="150" /> - <#t> -
-
+
-
-
+
+${stylesheets.add('')}
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/harvester/testfile.ftl b/productMods/templates/freemarker/body/harvester/testfile.ftl
index 03082f87..399b39d2 100644
--- a/productMods/templates/freemarker/body/harvester/testfile.ftl
+++ b/productMods/templates/freemarker/body/harvester/testfile.ftl
@@ -1,35 +1,64 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java
index 6f31ceef..b58eb03b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java
@@ -1,21 +1,24 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.webapp.controller.harvester;
+package edu.cornell.mannlib.vitro.webapp.controller.harvester;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONException;
@@ -39,6 +42,7 @@ public class TestFileController extends FreemarkerHttpServlet {
private static final String PARAMETER_FIRST_UPLOAD = "firstUpload";
private static final String PARAMETER_UPLOADED_FILE = "uploadedFile";
+ private static final String PARAMETER_IS_HARVEST_CLICK = "isHarvestClick";
@Override
protected ResponseValues processRequest(VitroRequest vreq) {
@@ -47,6 +51,7 @@ public class TestFileController extends FreemarkerHttpServlet {
//body.put("uploadPostback", "false");
body.put("paramFirstUpload", PARAMETER_FIRST_UPLOAD);
body.put("paramUploadedFile", PARAMETER_UPLOADED_FILE);
+ body.put("paramIsHarvestClick", PARAMETER_IS_HARVEST_CLICK);
return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
} catch (Throwable e) {
log.error(e, e);
@@ -65,7 +70,8 @@ public class TestFileController extends FreemarkerHttpServlet {
*/
public static String getHarvesterPath()
{
- String harvesterPath = "/usr/share/vivo/harvester/"; //todo: hack
+ //String harvesterPath = "/usr/share/vivo/harvester/"; //todo: hack
+ String harvesterPath = "/home/mbarbieri/workspace/HarvesterDevTomcat2/";
return harvesterPath;
}
@@ -75,7 +81,7 @@ public class TestFileController extends FreemarkerHttpServlet {
* @return the base directory for file harvest uploads
* @throws Exception if the Vitro home directory could not be found
*/
- private String getUploadPathBase(ServletContext context) throws Exception
+ private static String getUploadPathBase(ServletContext context) throws Exception
{
String vitroHomeDirectoryName = ConfigurationProperties.getBean(context).getProperty(FileStorageSetup.PROPERTY_VITRO_HOME_DIR);
if (vitroHomeDirectoryName == null) {
@@ -89,35 +95,66 @@ public class TestFileController extends FreemarkerHttpServlet {
/**
* Gets the FileHarvestJob implementation that is needed to handle the specified request. This
* will depend on the type of harvest being performed (CSV, RefWorks, etc.)
- * @param request the request from the browser
+ * @param vreq the request from the browser
* @return the FileHarvestJob that will provide harvest-type-specific services for this request
*/
- private FileHarvestJob getJob(HttpServletRequest request)
+ private FileHarvestJob getJob(VitroRequest vreq)
{
+ String namespace = vreq.getWebappDaoFactory().getDefaultNamespace();
+
//todo: complete
- return new CsvHarvestJob("persontemplate.csv");
+ return new CsvHarvestJob(vreq, "granttemplate.csv", namespace);
}
+ public static String getUploadPath(VitroRequest vreq) {
+ try {
+ String path = getUploadPathBase(vreq.getSession().getServletContext()) + getSessionId(vreq) + "/";
+ return path;
+ } catch(Exception e) {
+ log.error(e, e);
+ throw new RuntimeException(e);
+ }
+ }
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
+ log.error("this is a post.");
+
+ try {
+ boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+ if(isMultipart)
+ doFileUploadPost(request, response);
+ else if(request.getParameter(PARAMETER_IS_HARVEST_CLICK).toLowerCase().equals("true"))
+ doHarvestPost(request, response);
+ else
+ doCheckHarvestStatusPost(request, response);
+ } catch(Exception e) {
+ log.error(e, e);
+ }
+ }
+
+ private void doFileUploadPost(HttpServletRequest request, HttpServletResponse response)
+ throws IOException, ServletException {
+
+ log.error("file upload post.");
JSONObject json = new JSONObject();
try {
-
- String path = getUploadPathBase(request.getSession().getServletContext()) + getSessionId(request) + "/";
- File directory = new File(path);
-
+ VitroRequest vreq = new VitroRequest(request);
int maxFileSize = 1024 * 1024;
- FileUploadServletRequest req = FileUploadServletRequest.parseRequest(request, maxFileSize);
+ FileUploadServletRequest req = FileUploadServletRequest.parseRequest(vreq, maxFileSize);
if(req.hasFileUploadException()) {
Exception e = req.getFileUploadException();
new ExceptionVisibleToUser(e);
}
+
+ String path = getUploadPath(vreq);
+ File directory = new File(path);
String firstUpload = req.getParameter(PARAMETER_FIRST_UPLOAD); //clear directory on first upload
+ log.error(firstUpload);
if(firstUpload.toLowerCase().equals("true")) {
if(directory.exists()) {
File[] children = directory.listFiles();
@@ -130,7 +167,7 @@ public class TestFileController extends FreemarkerHttpServlet {
if(!directory.exists())
directory.mkdirs();
- FileHarvestJob job = getJob(req);
+ FileHarvestJob job = getJob(vreq);
Map