stuff

2 files changed, 5 insertions, 11 deletions

diff --git a/lisp/service/resume-service.lisp b/lisp/service/resume-service.lisp
index 3536a87..7e3aa71 100644
--- a/lisp/service/resume-service.lisp
+++ b/lisp/service/resume-service.lisp
@@ -76,7 +76,7 @@
     (with-resume-database
       (let* ((resume-pkg (make-instance 'resume-pkg))
              (user (get-user))
-             (resume (get-resume resume-pkg (make-instance 'resume :id id :user_id (id user)))))
+             (resume (get-record resume-pkg (make-instance 'resume :id id :user_id (id user)))))
         (if resume
             (setf (form instance) (make-form "resumes-modify-form"
                                              nil
@@ -87,18 +87,18 @@
             (setf (session-value :errormsg) "Error: could not modify resume. Not found."))))))
 
 (defun resumes-modify-submit-json (id name)
+  (declare (special id name))
   (with-auth (instance resumes/modify-service "resume-modify")
     (setf (title instance) "Resume - Modify")
     (with-resume-database
       (handler-case
           (let* ((resume-pkg (make-instance 'resume-pkg))
                  (user (get-user))
-                 (resume (get-resume resume-pkg (make-instance 'resume :id id :user_id (id user)))))
+                 (resume (get-record resume-pkg (make-instance 'resume :id id :user_id (id user)))))
             (loop for param in (remove-if (lambda (x)
                                             (intersection `(,x) '(id)))
                                           (sb-introspect:function-lambda-list #'resumes-modify-submit-json))
                   do (setf (slot-value resume param) (symbol-value param)))
-            (setf (name resume) name)
             (update-resume resume-pkg resume)
             (setf (session-value :message) (format nil "Resume \"~a\" modified successfully." (name resume))))
         (error (e)
@@ -113,7 +113,7 @@
     (with-resume-database
       (let* ((resume-pkg (make-instance 'resume-pkg))
              (user (get-user))
-             (resume (get-resume resume-pkg (make-instance 'resume :id id :user_id (id user)))))
+             (resume (get-record resume-pkg (make-instance 'resume :id id :user_id (id user)))))
         (if resume
             (progn
               (delete-resume resume-pkg resume)
@@ -207,7 +207,7 @@
              (user (get-user))
              (states (get-records resume-pkg (make-instance 'states) "abbr asc"))
              (visastatuses (get-records resume-pkg (make-instance 'visastatus) "status asc"))
-             (contactinfo-v (get-contactinfo resume-pkg (make-instance 'contactinfo-v :id id :user_id (id user)))))
+             (contactinfo-v (get-record resume-pkg (make-instance 'contactinfo-v :id id :user_id (id user)))))
         (if contactinfo-v
             (setf (form instance) (make-form "contactinfo-modify-form"
                                              nil
diff --git a/lisp/sql/resume-pkg.lisp b/lisp/sql/resume-pkg.lisp
index a0fc3d2..e44dfd4 100644
--- a/lisp/sql/resume-pkg.lisp
+++ b/lisp/sql/resume-pkg.lisp
@@ -13,9 +13,6 @@
     (let ((resume (make-instance 'resume :user_id (id user))))
       (get-records resume-pkg resume "name asc")))
 
-(defmethod get-resume ((resume-pkg resume-pkg) (resume resume))
-  (get-record resume-pkg resume))
-
 (defmethod insert-resume ((resume-pkg resume-pkg) (resume resume))
   (setf (*table resume) (format nil
                                 "resume.insert_resume(~a, '~a')"
@@ -38,9 +35,6 @@
   (let ((contactinfo-v (make-instance 'contactinfo-v :user_id (id user))))
     (get-records resume-pkg contactinfo-v "state_name asc, city asc, address asc, email asc, phone asc, visastatus asc")))
 
-(defmethod get-contactinfo ((resume-pkg resume-pkg) (contactinfo-v contactinfo-v))
-  (get-record resume-pkg contactinfo-v))
-
 (defmethod insert-contactinfo ((resume-pkg resume-pkg) (contactinfo contactinfo))
   (setf (*table contactinfo) (format nil
                                      "resume.insert_contactinfo(~a, ~a, ~a, '~a', '~a', '~a', '~a')"