Skip to content

Commit

Permalink
DOTPS-52
Browse files Browse the repository at this point in the history
  • Loading branch information
Oswaldo Gallango committed Jun 13, 2013
1 parent e75bc37 commit ef322b2
Show file tree
Hide file tree
Showing 4 changed files with 231 additions and 75 deletions.
18 changes: 9 additions & 9 deletions src/com/dotcms/solr/business/SolrAPIImpl.java
View file
Expand Up @@ -74,23 +74,23 @@ public void addContentToSolr(Contentlet con) throws DotSolrException {
dc.addObject(con.getIdentifier());
dc.addObject(con.getLanguageId());
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}else if(DbConnectionFactory.getDBType().equals(DbConnectionFactory.MSSQL)){
dc.setSQL(MSINSERTSOLRSQL);
dc.addParam(SolrAPI.ADD_OR_UPDATE_SOLR_ELEMENT);
dc.addObject(con.getIdentifier());
dc.addObject(con.getLanguageId());
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}else{
dc.setSQL(OCLINSERTSOLRSQL);
dc.addParam(SolrAPI.ADD_OR_UPDATE_SOLR_ELEMENT);
dc.addObject(con.getIdentifier());
dc.addObject(con.getLanguageId());
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}
HibernateUtil.commitTransaction();
Expand Down Expand Up @@ -136,23 +136,23 @@ public void removeContentFromSolr(Contentlet con) throws DotSolrException {
dc.addObject(con.getIdentifier());
dc.addObject(con.getLanguageId());
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}else if(DbConnectionFactory.getDBType().equals(DbConnectionFactory.MSSQL)){
dc.setSQL(MSDELETESOLRSQL);
dc.addParam(SolrAPI.DELETE_SOLR_ELEMENT);
dc.addObject(con.getIdentifier());
dc.addObject(con.getLanguageId());
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}else{
dc.setSQL(OCLDELETESOLRSQL);
dc.addParam(SolrAPI.DELETE_SOLR_ELEMENT);
dc.addObject(con.getIdentifier());
dc.addObject(con.getLanguageId());
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}
HibernateUtil.commitTransaction();
Expand Down Expand Up @@ -188,23 +188,23 @@ public void removeContentFromSolr(String identifier, long languageId) throws Dot
dc.addObject(identifier);
dc.addObject(languageId);
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}else if(DbConnectionFactory.getDBType().equals(DbConnectionFactory.MSSQL)){
dc.setSQL(MSDELETESOLRSQL);
dc.addParam(SolrAPI.DELETE_SOLR_ELEMENT);
dc.addObject(identifier);
dc.addObject(languageId);
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}else{
dc.setSQL(OCLDELETESOLRSQL);
dc.addParam(SolrAPI.DELETE_SOLR_ELEMENT);
dc.addObject(identifier);
dc.addObject(languageId);
dc.addParam(new Date());
dc.addParam(DbConnectionFactory.getDBFalse());
dc.addParam(Boolean.parseBoolean(DbConnectionFactory.getDBFalse()));
dc.loadResult();
}
HibernateUtil.commitTransaction();
Expand Down
10 changes: 4 additions & 6 deletions src/com/dotcms/solr/business/SolrQueueJob.java
View file
Expand Up @@ -94,12 +94,8 @@ public void execute(JobExecutionContext arg0) throws JobExecutionException {
if(solrQueue.size() > 0){
Map<String,Collection<SolrInputDocument>> addDocs = new HashMap<String,Collection<SolrInputDocument>>();
Map<String,List<Map<String,Object>>> solrIdAddDocs = new HashMap<String,List<Map<String,Object>>>();
//Collection<SolrInputDocument> addDocs = new ArrayList<SolrInputDocument>();
//List<Map<String,Object>> solrIdAddDocs = new ArrayList<Map<String,Object>>();
Map<String,List<String>> deleteDocs = new HashMap<String,List<String>>();
Map<String,List<Map<String,Object>>> solrIdDeleteDocs = new HashMap<String,List<Map<String,Object>>>();
//List<String> deleteDocs = new ArrayList<String>();
//List<Map<String,Object>> solrIdDeleteDocs = new ArrayList<Map<String,Object>>();
Map<String,Long> languages = new HashMap<String,Long>();

for(Map<String,Object> solr : solrQueue){
Expand All @@ -121,7 +117,8 @@ public void execute(JobExecutionContext arg0) throws JobExecutionException {
doc.addField("id", con.getIdentifier());
doc.addField("inode", con.getInode());
doc.addField("modUser", con.getModUser());
String modDate = UtilMethods.dateToHTMLDate(con.getModDate(), "yyyy-MM-dd")+"T"+ UtilMethods.dateToHTMLDate(con.getModDate(), "HH:mm:ss.S")+"Z";
//String modDate = UtilMethods.dateToHTMLDate(con.getModDate(), "yyyy-MM-dd")+"T"+ UtilMethods.dateToHTMLDate(con.getModDate(), "HH:mm:ss.S")+"Z";
String modDate = SolrUtil.getGenericFormattedDateText(con.getModDate(), SolrUtil.SOLR_DEFAULT_DATE_FORMAT);
doc.addField("modDate",modDate);
doc.addField("host", con.getHost());
doc.addField("folder", con.getFolder());
Expand All @@ -147,7 +144,8 @@ public void execute(JobExecutionContext arg0) throws JobExecutionException {
if(f.getFieldType().equals(Field.FieldType.DATE.toString()) || f.getFieldType().equals(Field.FieldType.DATE_TIME.toString())){
String date = "";
if(UtilMethods.isSet(value)){
date = UtilMethods.dateToHTMLDate((Date)value, "yyyy-MM-dd")+"T"+ UtilMethods.dateToHTMLDate((Date)value, "HH:mm:ss.S")+"Z";
//date = UtilMethods.dateToHTMLDate((Date)value, "yyyy-MM-dd")+"T"+ UtilMethods.dateToHTMLDate((Date)value, "HH:mm:ss.S")+"Z";
date = SolrUtil.getFormattedUTCDateText((Date) value, SolrUtil.SOLR_DEFAULT_DATE_FORMAT);
}
doc.addField(solrFieldName, date);
}else if(f.getFieldType().equals(Field.FieldType.FILE.toString()) || f.getFieldType().equals(Field.FieldType.IMAGE.toString())){
Expand Down
7 changes: 4 additions & 3 deletions src/com/dotcms/solr/util/SolrPluginDeployer.java
View file
Expand Up @@ -45,10 +45,10 @@ public boolean redeploy(String version) {
try {
boolean dropAndRecreateTable = Boolean.parseBoolean(pluginAPI.loadProperty(pluginId, "com.dotcms.solr.DROP_AND_RECREATE_TABLE"));
if(dropAndRecreateTable){
SolrUtil.deleteSolrTable();
SolrUtil.deleteSolrTable();
SolrUtil.createSolrTable();
}
SolrUtil.createSolrTable();
SolrUtil.UpdateHostTable();

String jobName = pluginAPI.loadProperty(pluginId, "quartz.job.name");
String jobGroup = pluginAPI.loadProperty(pluginId, "quartz.job.group");
String jobDescription = pluginAPI.loadProperty(pluginId, "quartz.job.description");
Expand All @@ -57,6 +57,7 @@ public boolean redeploy(String version) {

CronScheduledTask cronScheduledTask = new CronScheduledTask(jobName, jobGroup, jobDescription, javaClassname, new Date(), null, CronTrigger.MISFIRE_INSTRUCTION_FIRE_ONCE_NOW, new HashMap<String, Object>(), cronExpression);
QuartzUtils.scheduleTask(cronScheduledTask);
SolrUtil.UpdateHostTable();
return true;
}catch(Exception e){
Logger.error(SolrPluginDeployer.class,e.getMessage(),e);
Expand Down

0 comments on commit ef322b2

Please sign in to comment.