inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted back to this morning's code - changes are too hacky and nasty

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-08-30 18:07:17 +00:00
parent ef70fb04bf
commit 25fdf04983
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
View File

@@ -160,10 +160,10 @@
<column name="child_node_id" /> <column name="child_node_id" />
</many-to-one> </many-to-one>
<property name="typeQName" column="type_qname" type="QName" length="255" not-null="true" unique-key="UIDX_CHILD_NAME" /> <property name="typeQName" column="type_qname" type="QName" length="255" not-null="true" unique-key="UIDX_CHILD_NAME" />
<property name="qname" column="qname" type="QName" length="255" not-null="true" />
</natural-id> </natural-id>
<property name="childNodeName" column="child_node_name" type="string" length="50" not-null="true" unique-key="UIDX_CHILD_NAME" /> <property name="childNodeName" column="child_node_name" type="string" length="50" not-null="true" unique-key="UIDX_CHILD_NAME" />
<property name="childNodeNameCrc" column="child_node_name_crc" type="long" not-null="true" unique-key="UIDX_CHILD_NAME" /> <property name="childNodeNameCrc" column="child_node_name_crc" type="long" not-null="true" unique-key="UIDX_CHILD_NAME" />
<property name="qname" column="qname" type="QName" length="255" not-null="true" />
<property name="isPrimary" column="is_primary" /> <property name="isPrimary" column="is_primary" />
<property name="index" column="assoc_index" /> <property name="index" column="assoc_index" />
</class> </class>

8
source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
View File

@@ -383,12 +383,12 @@ public class HibernateNodeDaoServiceImpl extends HibernateDaoSupport implements
* if the association is recreated subsequently. * if the association is recreated subsequently.
*/ */
String tempUuid = GUID.generate(); String uuid = childNode.getUuid();
ChildAssoc assoc = new ChildAssocImpl(); ChildAssoc assoc = new ChildAssocImpl();
assoc.setTypeQName(assocTypeQName); assoc.setTypeQName(assocTypeQName);
assoc.setChildNodeName(getShortName(tempUuid)); assoc.setChildNodeName(getShortName(uuid));
assoc.setChildNodeNameCrc(getCrc(tempUuid)); assoc.setChildNodeNameCrc(getCrc(uuid));
assoc.setQname(qname); assoc.setQname(qname);
assoc.setIsPrimary(isPrimary); assoc.setIsPrimary(isPrimary);
assoc.buildAssociation(parentNode, childNode); assoc.buildAssociation(parentNode, childNode);
@@ -424,7 +424,7 @@ public class HibernateNodeDaoServiceImpl extends HibernateDaoSupport implements
String childNameNew = null; String childNameNew = null;
if (childName == null) if (childName == null)
{ {
childNameNew = childAssoc.getId().toString(); childNameNew = childAssoc.getChild().getUuid();
} }
else else
{ {