LPS-32110 Add macro method, insertDLSync.

ipeychev · Mar 29, 2013 · 67b4817 · 67b4817
1 parent cec2880
commit 67b4817
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/dl_file_entry.ftl b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/dl_file_entry.ftl
@@ -6,9 +6,7 @@ insert into DLFileEntry values ('${dlFileEntry.uuid}', ${dlFileEntry.fileEntryId
 
 insert into DLFileVersion values ('${dlFileVersion.uuid}', ${dlFileVersion.fileVersionId}, ${dlFileVersion.groupId}, ${dlFileVersion.companyId}, ${dlFileVersion.userId}, '${dlFileVersion.userName}', '${dataFactory.getDateString(dlFileVersion.createDate)}', '${dataFactory.getDateString(dlFileVersion.modifiedDate)}', ${dlFileVersion.repositoryId}, ${dlFileVersion.folderId}, ${dlFileVersion.fileEntryId}, '${dlFileVersion.extension}', '${dlFileVersion.mimeType}', '${dlFileVersion.title}','${dlFileVersion.description}', '${dlFileVersion.changeLog}', '${dlFileVersion.extraSettings}', ${dlFileVersion.fileEntryTypeId}, '${dlFileVersion.version}', ${dlFileVersion.size}, '${dlFileVersion.checksum}', ${dlFileVersion.status}, ${dlFileVersion.statusByUserId}, '${dlFileVersion.statusByUserName}', ${dlFileVersion.statusDate!'null'});
 
-<#assign dlSync = dataFactory.newDLSync(dlFileEntry)>
-
-insert into DLSync values (${dlSync.syncId}, ${dlSync.companyId}, ${dlSync.createDate}, ${dlSync.modifiedDate}, ${dlSync.fileId}, '${dlSync.fileUuid}', ${dlSync.repositoryId}, ${dlSync.parentFolderId}, '${dlSync.name}', '${dlSync.description}', '${dlSync.event}', '${dlSync.type}', '${dlSync.version}');
+<@insertDLSync _entry = dlFileEntry/>
 
 <@insertAssetEntry _entry = dlFileEntry/>
 

diff --git a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/dl_folders.ftl b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/dl_folders.ftl
@@ -18,8 +18,6 @@
 
 		${sampleSQLBuilder.insertDLFolders(groupId, dlFolder.folderId, dlFolderDepth + 1, ddmStructureId)}
 
-		<#assign dlSync = dataFactory.newDLSync(dlFolder)>
-
-		insert into DLSync values (${dlSync.syncId}, ${dlSync.companyId}, ${dlSync.createDate}, ${dlSync.modifiedDate}, ${dlSync.fileId}, '${dlSync.fileUuid}', ${dlSync.repositoryId}, ${dlSync.parentFolderId}, '${dlSync.name}', '${dlSync.description}', '${dlSync.event}', '${dlSync.type}', '${dlSync.version}');
+		<@insertDLSync _entry = dlFolder/>
 	</#list>
 </#if>
diff --git a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/macro.ftl b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/macro.ftl
@@ -14,4 +14,12 @@
 	<#local ddmStructureLink = dataFactory.newDDMStructureLink(_entry)>
 
 	insert into DDMStructureLink values (${ddmStructureLink.structureLinkId},${ ddmStructureLink.classNameId}, ${ddmStructureLink.classPK}, ${ddmStructureLink.structureId});
+</#macro>
+
+<#-- insert DLSync -->
+
+<#macro insertDLSync _entry>
+	<#local dlSync = dataFactory.newDLSync(_entry)>
+
+	insert into DLSync values (${dlSync.syncId}, ${dlSync.companyId}, ${dlSync.createDate}, ${dlSync.modifiedDate}, ${dlSync.fileId}, '${dlSync.fileUuid}', ${dlSync.repositoryId}, ${dlSync.parentFolderId}, '${dlSync.name}', '${dlSync.description}', '${dlSync.event}', '${dlSync.type}', '${dlSync.version}');
 </#macro>