[open-ils-commits] r14529 - in trunk/Open-ILS: examples src/c-apps (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-10-21 11:45:50 -0400 (Wed, 21 Oct 2009)
New Revision: 14529

Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
rolling back 14518 and 14519. thinko

Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2009-10-21 15:24:39 UTC (rev 14528)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2009-10-21 15:45:50 UTC (rev 14529)
@@ -2144,7 +2144,7 @@
 			<link field="payment_total" reltype="might_have" key="xact" map="" class="rxpt"/>
 			<link field="workstation" reltype="has_a" key="id" map="" class="aws"/>
 			<link field="checkin_workstation" reltype="has_a" key="id" map="" class="aws"/>
-			<link field="parent_circ" reltype="might_have" key="id" map="" class="circ"/>
+			<link field="parent_circ" reltype="has_a" key="id" map="" class="circ"/>
 			<link field="renewals" reltype="has_many" key="parent_circ" map="" class="circ"/>
 		</links>
 	</class>

Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2009-10-21 15:24:39 UTC (rev 14528)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2009-10-21 15:45:50 UTC (rev 14529)
@@ -4743,12 +4743,9 @@
 							value_field = osrfHashGet( fields, osrfHashGet(meta, "primarykey") );
 						}
 							
-                        /* This causes 'might_have' fleshing to flesh the base object onto itself as 
-                         * opposed to the linked object when fleshing a self-referential foreign key
 						if (!(strcmp( osrfHashGet(kid_link, "reltype"), "might_have" ))) { // might_have
 							value_field = osrfHashGet( fields, osrfHashGet(meta, "primarykey") );
 						}
-                        */
 
 						osrfStringArray* link_map = osrfHashGet( kid_link, "map" );