From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 21 Oct 2009 15:45:50 +0000 (+0000)
Subject: rolling back 14518 and 14519. thinko
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3595554b1d0e38be56ff85c255468f3dc8305ba6;p=evergreen%2Fpines.git

rolling back 14518 and 14519. thinko

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14529 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 44a6475325..b4d4c57906 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2144,7 +2144,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<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>
diff --git a/Open-ILS/src/c-apps/oils_cstore.c b/Open-ILS/src/c-apps/oils_cstore.c
index f8836d16df..81ed19e9be 100644
--- a/Open-ILS/src/c-apps/oils_cstore.c
+++ b/Open-ILS/src/c-apps/oils_cstore.c
@@ -4743,12 +4743,9 @@ static jsonObject* doFieldmapperSearch ( osrfMethodContext* ctx, osrfHash* meta,
 							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" );