fixed sources stuff

Author: SchwartzNU

schemas/+sln_animal/add_source.m

@@ -18,12 +18,13 @@
         try
             %source_id = add_source_if_missing(...)
             insert(sln_animal.Source,key_s);
-            source_id(i) = fetch1(sln_animal.Source, 'source_id', 'LIMIT 1 DESC');
+            source_id(i) = fetch1(sln_animal.Source, 'source_id', 'ORDER BY source_id DESC LIMIT 1');
             key.source_id = source_id(i);
             insert(feval(sprintf('sln_animal.%s',source_type)), key);
             C.commitTransaction;
-        catch
+        catch ME            
             C.cancelTransaction;
+            rethrow(ME)
         end
     end
 end

schemas/+sln_animal/init_animals.m

@@ -63,13 +63,10 @@
     curSourceID = old_animals(curInd).source_id;
 
     if ismember(curSourceID, all_breeding_cages)
-        b = sl.BreedingCage & sprintf('cage_number="%s"', curSourceID)
-        b.getMember('Male')        
-        pause;
+        b = sl.BreedingCage & sprintf('cage_number="%s"', curSourceID);
         try
-
-            key.male_id = fetch1(b.getMember('Male'), 'animal_id')
-            key.female_id = fetch1(b.getMember('Female'), 'animal_id')
+            key.male_id = fetch1(b.getMember('Male'), 'animal_id');
+            key.female_id = fetch1(b.getMember('Female'), 'animal_id');
             id = sln_animal.add_source(key,'BreedingPair');
             active_breeding_cage_ind = [active_breeding_cage_ind, curInd];
             new_animals(curInd).source_id = id;