* EOAccess/EOEntity.m (-initWithPropertyList:owner:): Correct

test for file existance and reformat.
        * EOControl/EOFetchSpecification.h/m
        (-fetchSpecificationByApplyingBindings:) Remove obsolete
        method.
        (-fetchSpecificationWithQualifierBindings:) Implement.
        * EOControl/EOQualifier.m (initWithKeyValueUnarchiver:):
        Implement.
        (-encodeWithKeyValueArchiver:): Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20617 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,15 @@
+2005-01-26  Juergen Lorenz Simon  <juergen_simon@mac.com>
+	    David Ayers  <d.ayers@inode.at>
+
+	* EOAccess/EOEntity.m (-initWithPropertyList:owner:): Correct
+	test for file existance and reformat.
+	* EOControl/EOFetchSpecification.h/m 
+	(-fetchSpecificationByApplyingBindings:) Remove obsolete method.
+	(-fetchSpecificationWithQualifierBindings:) Implement.
+	* EOControl/EOQualifier.m (initWithKeyValueUnarchiver:):
+	Implement.
+	(-encodeWithKeyValueArchiver:): Ditto.
+	
 2005-01-22  David Ayers  <d.ayers@inode.at>
 
 	* EOControl/EOQualifer.m (getKey): Allow literal numbers without

EOAccess/EOEntity.m

@@ -295,16 +295,15 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
           // load entity's FetchSpecifications
           {
             NSDictionary *plist = nil;
-            NSString *fileName;
-            
+            NSString* fileName;
+            NSString* path;
+
             fileName = [NSString stringWithFormat: @"%@.fspec", _name];
-
-	    if ([[NSFileManager defaultManager] fileExistsAtPath: fileName])
-	      plist = [[NSString stringWithContentsOfFile:
-				   [[(EOModel *)owner path]
-				     stringByAppendingPathComponent: fileName]]
-			propertyList];
-
+            path = [[(EOModel *)owner path] stringByAppendingPathComponent: fileName];
+	    if ([[NSFileManager defaultManager] fileExistsAtPath: path])
+		plist 
+		  = [[NSString stringWithContentsOfFile: path] propertyList];
+	    
             if (plist) 
               {
                 EOKeyValueUnarchiver *unarchiver;

EOControl/EOFetchSpecification.h

@@ -74,8 +74,6 @@
 		  isDeep: (BOOL)isDeep
 		   hints: (NSDictionary *)hints;
 
-- (EOFetchSpecification *)fetchSpecificationByApplyingBindings: (id)bindings;
-
 - (EOFetchSpecification *)fetchSpecificationWithQualifierBindings: (NSDictionary *)bindings;
 
 + (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)name

EOControl/EOFetchSpecification.m

@@ -143,16 +143,15 @@ NSString *EOPromptAfterFetchLimitHintKey = @"EOPromptAfterFetchLimitHintKey";
   return self;
 }
 
-- (EOFetchSpecification *)fetchSpecificationByApplyingBindings: (id)bindings
-{
-  [self notImplemented:_cmd];
-  return nil;
-}
-
 - (EOFetchSpecification *)fetchSpecificationWithQualifierBindings: (NSDictionary *)bindings
 {
-  [self notImplemented: _cmd];
-  return nil;
+  EOQualifier *qualifier;
+  BOOL flag = [self requiresAllQualifierBindingVariables];
+
+  qualifier = [[self qualifier] qualifierWithBindings: bindings
+				requiresAllVariables: flag];
+  [self setQualifier: qualifier];
+  return self;
 }
 
 + (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)name

EOControl/EOQualifier.m

@@ -972,12 +972,16 @@ static Class whichQualifier(const char **cFormat, const char **s)
 
 - (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver
 {
-  return [self notImplemented: _cmd]; //TODO
+  if ((self = [super init]))
+    {
+      _key = RETAIN([unarchiver decodeObjectForKey: @"_key"]);
+    }
+  return self;
 }
 
 - (void)encodeWithKeyValueArchiver: (EOKeyValueArchiver *)archiver
 {
-  [self notImplemented: _cmd]; //TODO
+  [archiver encodeObject: _key forKey: @"_key"];
 }
 
 @end