Commits
Renaud Miel authored 4128f18d20c Merge
323 323 | |
324 324 | setSpectralWindowId(Parser::getTag("spectralWindowId","DataDescription",rowDoc)); |
325 325 | |
326 326 | |
327 327 | |
328 328 | |
329 329 | if (row.isStr("<pulsarId>")) { |
330 330 | |
331 331 | setPulsarId(Parser::getTag("pulsarId","Pulsar",rowDoc)); |
332 332 | |
333 - | } |
333 + | } else { |
334 + | clearPulsarId(); |
335 + | } |
334 336 | |
335 337 | |
336 338 | |
337 339 | |
338 340 | |
339 341 | } catch (IllegalAccessException err) { |
340 342 | throw ConversionException (err.getMessage(),"DataDescription"); |
341 343 | } |
342 344 | } |
343 345 | |
716 718 | |
717 719 | |
718 720 | /** |
719 721 | * Create a DataDescriptionRow. |
720 722 | * <p> |
721 723 | * This constructor is private because only the |
722 724 | * table can create rows. All rows know the table |
723 725 | * to which they belong. |
724 726 | * @param table The table to which this row belongs. |
725 727 | */ |
726 - | DataDescriptionRow::DataDescriptionRow (DataDescriptionTable &t) : table(t) { |
728 + | DataDescriptionRow::DataDescriptionRow (DataDescriptionTable &t) : table(t) { |
727 729 | hasBeenAdded = false; |
730 + | pulsarIdExists = false; |
728 731 | |
729 732 | |
730 733 | |
731 734 | |
732 735 | |
733 736 | |
734 737 | |
735 738 | |
736 739 | |
737 740 | |
761 764 | |
762 765 | fromTextMethods["spectralWindowId"] = &DataDescriptionRow::spectralWindowIdFromText; |
763 766 | |
764 767 | |
765 768 | fromTextMethods["pulsarId"] = &DataDescriptionRow::pulsarIdFromText; |
766 769 | |
767 770 | } |
768 771 | |
769 772 | DataDescriptionRow::DataDescriptionRow (DataDescriptionTable &t, DataDescriptionRow *row) : table(t) { |
770 773 | hasBeenAdded = false; |
774 + | pulsarIdExists = false; |
771 775 | |
772 776 | if (row == 0) { |
773 777 | |
774 778 | |
775 779 | |
776 780 | |
777 781 | |
778 782 | |
779 783 | |
780 784 | |