- (let ((key (cons filename fieldname)))
- (multiple-value-bind (pos found) (gethash key *position-hash*)
- (if found
- (return-from position-field-file pos)))
-
- (let ((ufile (find-ufile filename)))
- (unless ufile
- (warn "Unable to find ufile for filename ~A." filename)
+ (multiple-value-bind (pos found) (gethash key *position-hash*)
+ (if found
+ (return-from position-field-file pos)))
+
+ (let ((ufile (find-ufile filename)))
+ (unless ufile
+ (warn "Unable to find ufile for filename ~A." filename)
+ (return-from position-field-file nil))
+ (let ((pos (position fieldname (fields ufile) :test #'string=)))
+ (unless pos
+ (warn "Unable to find field ~A in ufile ~S." fieldname ufile)