diff --git a/application/controllers/ArchiveController.php b/application/controllers/ArchiveController.php index ddd0a8be..8fb1fbb0 100644 --- a/application/controllers/ArchiveController.php +++ b/application/controllers/ArchiveController.php @@ -831,9 +831,9 @@ protected function getCourseData(osid_course_Course $course) // Look for different Section Descriptions $offeringQuery = $this->offeringSearchSession->getCourseOfferingQuery(); $offeringQuery->matchCourseId($course->getId(), true); - $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'), true); - $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/SEM'), true); - $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/IND'), true); + $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'), true); + $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.SEM'), true); + $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.IND'), true); foreach ($this->selectedTerms as $termId) { $offeringQuery->matchTermId($termId, true); } @@ -856,7 +856,7 @@ protected function getCourseData(osid_course_Course $course) $instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $identifiersType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:banner_identifiers'); $namesType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); - $requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $enrollmentNumbersType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment_numbers'); while ($offerings->hasNext()) { $offering = $offerings->getNextCourseOffering(); @@ -1028,7 +1028,7 @@ protected function getCourseData(osid_course_Course $course) // Apply all course-level topics. $allTopics = $this->_helper->topics->topicListAsArray($course->getTopics()); $reqs = []; - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { diff --git a/application/controllers/CoursesController.php b/application/controllers/CoursesController.php index 385863a9..2e604c41 100755 --- a/application/controllers/CoursesController.php +++ b/application/controllers/CoursesController.php @@ -137,7 +137,7 @@ public function viewAction() public function viewxmlAction() { $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); + $this->getResponse()->setHeader('Content-Type', 'text.xml'); $this->viewAction(); } @@ -455,8 +455,8 @@ public function instructorxmlAction() throw new InvalidArgumentException('An instructor must be specified.'); } - $instructorId = $this->_helper->osidId->fromString('resource/person/'.$instructor); - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'resources', null, ['catalog' => $this->_getParam('catalog'), 'resource' => 'resouce/person/'.$instructor])); + $instructorId = $this->_helper->osidId->fromString('resource.person.'.$instructor); + $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'resources', null, ['catalog' => $this->_getParam('catalog'), 'resource' => 'resouce.person.'.$instructor])); $resourceLookup = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { @@ -610,7 +610,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse } $allTopics = $this->_helper->topics->topicListAsArray($course->getTopics()); - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -620,7 +620,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse echo ' '; } - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -630,7 +630,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse echo ' '; } - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { diff --git a/application/controllers/ExportController.php b/application/controllers/ExportController.php index 91d7349c..d27ec627 100644 --- a/application/controllers/ExportController.php +++ b/application/controllers/ExportController.php @@ -450,8 +450,8 @@ public function generatecourselistAction() if ($request->getParam('catalogId')) { $catalogId = $this->_helper->osidId->fromString($request->getParam('catalogId')); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); $topicSearchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); $topicQuery = $topicSearchSession->getTopicQuery(); @@ -533,7 +533,7 @@ public function validtermAction() $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); try { - $termString = 'term/'.$request->getParam('term'); + $termString = 'term.'.$request->getParam('term'); $termId = $this->_helper->osidId->fromString($termString); } catch (osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); diff --git a/application/controllers/JsonController.php b/application/controllers/JsonController.php index c3efec99..fe035c7c 100644 --- a/application/controllers/JsonController.php +++ b/application/controllers/JsonController.php @@ -37,7 +37,7 @@ public function init() public function termsAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $lookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $currentTermId = $this->_helper->osidTerms->getNextOrLatestTermId($catalogId); } else { @@ -52,7 +52,7 @@ public function termsAction() if ($currentTermId) { $term = $lookupSession->getTerm($currentTermId); $result['terms'][] = [ - 'code' => preg_replace('/^term\//', '', $term->getId()->getIdentifier()), + 'code' => preg_replace('/^term\./', '', $term->getId()->getIdentifier()), 'description' => $term->getDisplayName(), ]; } @@ -63,7 +63,7 @@ public function termsAction() continue; } $result['terms'][] = [ - 'code' => preg_replace('/^term\//', '', $term->getId()->getIdentifier()), + 'code' => preg_replace('/^term\./', '', $term->getId()->getIdentifier()), 'description' => $term->getDisplayName(), ]; } @@ -83,7 +83,7 @@ public function termsAction() public function areasAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $topicSearchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); } else { @@ -97,10 +97,10 @@ public function areasAction() if (empty($code)) { throw new InvalidArgumentException('Missing the "code" parameter.'); } - $termId = $this->_helper->osidId->fromString('term/'.$code); + $termId = $this->_helper->osidId->fromString('term.'.$code); $term = $termLookupSession->getTerm($termId); - $genera = 'topic/subject'; + $genera = 'topic.subject'; $generaType = $this->_helper->osidType->fromString('genera:'.$genera); $termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); @@ -121,7 +121,7 @@ public function areasAction() while ($topics->hasNext()) { $topic = $topics->getNextTopic(); $result['areas'][] = [ - 'area' => preg_replace('/^'.str_replace('/', '\/', $genera).'\//', '', $topic->getId()->getIdentifier()), + 'area' => preg_replace('/^'.str_replace('.', '\.', $genera).'\./', '', $topic->getId()->getIdentifier()), 'name' => $topic->getDisplayName(), ]; } @@ -141,7 +141,7 @@ public function areasAction() public function catalogAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $searchSession = $this->_helper->osid->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $topicLookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); @@ -158,18 +158,18 @@ public function catalogAction() $offeringLookupSession->useFederatedCourseCatalogView(); // Validate our arguments. - $genera = 'topic/subject'; + $genera = 'topic.subject'; $area = $this->_getParam('area'); if (empty($area)) { throw new InvalidArgumentException('Missing the "area" parameter.'); } - $topicId = $this->_helper->osidId->fromString($genera.'/'.$area); + $topicId = $this->_helper->osidId->fromString($genera.'.'.$area); $topic = $topicLookupSession->getTopic($topicId); $code = $this->_getParam('code'); if (empty($code)) { throw new InvalidArgumentException('Missing the "code" parameter.'); } - $termId = $this->_helper->osidId->fromString('term/'.$this->_getParam('code')); + $termId = $this->_helper->osidId->fromString('term.'.$this->_getParam('code')); $term = $termLookupSession->getTerm($termId); // Build the query. @@ -200,7 +200,7 @@ public function catalogAction() public function searchAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $searchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $topicLookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); @@ -229,15 +229,15 @@ public function searchAction() if (empty($code)) { throw new InvalidArgumentException('Missing the "code" parameter.'); } - $termId = $this->_helper->osidId->fromString('term/'.$this->_getParam('code')); + $termId = $this->_helper->osidId->fromString('term.'.$this->_getParam('code')); $term = $termLookupSession->getTerm($termId); $query->matchTermId($termId, true); - $genera = 'topic/subject'; + $genera = 'topic.subject'; $area = $this->_getParam('area'); if (!empty($area)) { - $topicId = $this->_helper->osidId->fromString($genera.'/'.$area); + $topicId = $this->_helper->osidId->fromString($genera.'.'.$area); $topic = $topicLookupSession->getTopic($topicId); $query->matchTopicId($topicId, true); } diff --git a/application/controllers/OfferingsController.php b/application/controllers/OfferingsController.php index 5e91c9f4..16815c9e 100755 --- a/application/controllers/OfferingsController.php +++ b/application/controllers/OfferingsController.php @@ -35,17 +35,17 @@ public function init() parent::init(); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus'); + $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); } /** diff --git a/application/controllers/ResourcesController.php b/application/controllers/ResourcesController.php index 6bb8f5f7..77af7c19 100755 --- a/application/controllers/ResourcesController.php +++ b/application/controllers/ResourcesController.php @@ -127,7 +127,7 @@ public function viewAction() */ public function listcampusestxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus')); } /** diff --git a/application/controllers/TopicsController.php b/application/controllers/TopicsController.php index 57bdbd5a..453bb5fa 100755 --- a/application/controllers/TopicsController.php +++ b/application/controllers/TopicsController.php @@ -241,7 +241,7 @@ public function viewxmlAction() */ public function listsubjectstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); } /** @@ -253,7 +253,7 @@ public function listsubjectstxtAction() */ public function listrequirementstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); } /** @@ -265,7 +265,7 @@ public function listrequirementstxtAction() */ public function listlevelstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); } /** @@ -277,7 +277,7 @@ public function listlevelstxtAction() */ public function listblockstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); } /** @@ -289,7 +289,7 @@ public function listblockstxtAction() */ public function listinstructionmethodstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); } /** @@ -301,7 +301,7 @@ public function listinstructionmethodstxtAction() */ public function listdepartmentstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); } /** diff --git a/application/library/AbstractCatalogController.php b/application/library/AbstractCatalogController.php index 6ea1bb2b..ea3cdcd2 100755 --- a/application/library/AbstractCatalogController.php +++ b/application/library/AbstractCatalogController.php @@ -96,19 +96,19 @@ protected function loadTopics(osid_course_TopicList $topicList) { $topics = $this->_helper->topics->topicListAsArray($topicList); - $this->view->subjectTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject')); + $this->view->subjectTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); - $this->view->departmentTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department')); + $this->view->departmentTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); - $this->view->divisionTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division')); + $this->view->divisionTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division')); - $this->view->requirementTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement')); + $this->view->requirementTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); - $this->view->levelTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level')); + $this->view->levelTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); - $this->view->blockTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block')); + $this->view->blockTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); - $this->view->instructionMethodTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method')); + $this->view->instructionMethodTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); } private $startTime; diff --git a/application/library/apc/course/CourseManager.php b/application/library/apc/course/CourseManager.php index 91ab29df..109fc2f8 100755 --- a/application/library/apc/course/CourseManager.php +++ b/application/library/apc/course/CourseManager.php @@ -28,7 +28,7 @@ public function __construct() { parent::__construct(); - $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations/apc_course')); + $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations.apc_course')); $this->setDisplayName('APC Caching Course Manager'); $this->setDescription('This is a CourseManager implementation that provides read-only, unauthenticated, access to course information stored in an underlying course manager.'); } @@ -74,7 +74,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $implClassName = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:apc_course/impl_class_name'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:apc_course.impl_class_name'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode(), $e); diff --git a/application/library/banner/AbstractSession.php b/application/library/banner/AbstractSession.php index b70cd6c0..c800b4d0 100755 --- a/application/library/banner/AbstractSession.php +++ b/application/library/banner/AbstractSession.php @@ -145,11 +145,11 @@ protected function usesIsolatedView() public function getDatabaseIdString(osid_id_Id $id, $prefix = null) { if ('urn' != $id->getIdentifierNamespace()) { - throw new osid_NotFoundException('I only know about Ids in the urn namespace.'); + throw new osid_NotFoundException('I only know about Ids in the urn namespace, got: '.$id->getIdentifierNamespace()); } if ($id->getAuthority() != $this->manager->getIdAuthority()) { - throw new osid_NotFoundException('I only know about Ids under the '.$this->manager->getIdAuthority().' authority.'); + throw new osid_NotFoundException('I only know about Ids under the '.$this->manager->getIdAuthority().' authority, got: '.$id->getAuthority()); } if (null === $prefix) { @@ -159,7 +159,7 @@ public function getDatabaseIdString(osid_id_Id $id, $prefix = null) } if (!str_starts_with($id->getIdentifier(), $prefix)) { - throw new osid_NotFoundException('I only know about Ids with the '.$prefix.' prefix.'); + throw new osid_NotFoundException('I only know about Ids with the '.$prefix.' prefix, got: '.$id->getIdentifier()); } return substr($id->getIdentifier(), strlen($prefix)); @@ -195,7 +195,7 @@ public function getOsidIdFromString($databaseId, $prefix = null) */ public function getTermCodeFromTermId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'term/'); + $string = $this->getDatabaseIdString($id, 'term.'); if (!preg_match('#^([0-9]{6})$#', $string)) { throw new osid_NotFoundException("String '$string' cannot be broken into a term-code"); } @@ -214,8 +214,8 @@ public function getTermCodeFromTermId(osid_id_Id $id) */ public function getTermCodeFromOfferingId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'section/'); - if (!preg_match('#^([0-9]{6})/([0-9]{1,5})$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'section.'); + if (!preg_match('#^([0-9]{6})\.([0-9]{1,5})$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a term-code and CRN."); } @@ -233,8 +233,8 @@ public function getTermCodeFromOfferingId(osid_id_Id $id) */ public function getCrnFromOfferingId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'section/'); - if (!preg_match('#^([0-9]{6})/([0-9]{1,5})$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'section.'); + if (!preg_match('#^([0-9]{6})\.([0-9]{1,5})$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a term-code and CRN."); } @@ -250,7 +250,7 @@ public function getCrnFromOfferingId(osid_id_Id $id) */ public function getSubjectFromCourseId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'course/'); + $string = $this->getDatabaseIdString($id, 'course.'); if (!preg_match('#^([A-Z]{2,4})([A-Z0-9]{3,5})$#i', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a subject-code and Number."); } @@ -267,7 +267,7 @@ public function getSubjectFromCourseId(osid_id_Id $id) */ public function getNumberFromCourseId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'course/'); + $string = $this->getDatabaseIdString($id, 'course.'); if (!preg_match('#^([A-Z]{2,4})([A-Z0-9]{3,5})$#i', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a subject-code and Number."); } diff --git a/application/library/banner/course/AbstractSession.php b/application/library/banner/course/AbstractSession.php index df804b2d..f5de7375 100755 --- a/application/library/banner/course/AbstractSession.php +++ b/application/library/banner/course/AbstractSession.php @@ -26,7 +26,7 @@ abstract class banner_course_AbstractSession extends banner_AbstractSession impl */ public function getCatalogDatabaseId(osid_id_Id $id) { - return $this->getDatabaseIdString($id, 'catalog/'); + return $this->getDatabaseIdString($id, 'catalog.'); } /** @@ -159,7 +159,7 @@ public function getOfferingIdFromTermCodeAndCrn($termCode, $crn) throw new osid_OperationFailedException('Both termCode and CRN must be specified.'); } - return $this->getOsidIdFromString($termCode.'/'.$crn, 'section/'); + return $this->getOsidIdFromString($termCode.'.'.$crn, 'section.'); } /** @@ -177,7 +177,7 @@ public function getCourseIdFromSubjectAndNumber($subjectCode, $number) throw new osid_OperationFailedException('Both subjectCode and number must be specified.'); } - return $this->getOsidIdFromString($subjectCode.$number, 'course/'); + return $this->getOsidIdFromString($subjectCode.$number, 'course.'); } /** @@ -189,8 +189,8 @@ public function getCourseIdFromSubjectAndNumber($subjectCode, $number) */ public function getTermCodeFromTermId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'term/'); - if (!preg_match('#^([0-9]{6})(?:/(.{1,3}))?$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'term.'); + if (!preg_match('#^([0-9]{6})(?:\.(.{1,3}))?$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be converted into a valid term code."); } @@ -206,8 +206,8 @@ public function getTermCodeFromTermId(osid_id_Id $id) */ public function getPartOfTermCodeFromTermId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'term/'); - if (!preg_match('#^([0-9]{6})(?:/(.{1,3}))$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'term.'); + if (!preg_match('#^([0-9]{6})(?:\.(.{1,3}))$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be converted into a valid part-of-term code."); } @@ -229,8 +229,8 @@ public function getScheduleCodeFromGenusType(osid_type_Type $genusType) throw new osid_NotFoundException("I only know about the '".$this->getIdAuthority()."' authority"); } - if (!preg_match('/^genera:offering\/([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { - throw new osid_NotFoundException("I only know about identifiers beginning with 'genera:offering/'"); + if (!preg_match('/^genera:offering\.([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { + throw new osid_NotFoundException("I only know about identifiers beginning with 'genera:offering.'"); } return $matches[1]; diff --git a/application/library/banner/course/Course.php b/application/library/banner/course/Course.php index 717d6d4b..4d905f64 100755 --- a/application/library/banner/course/Course.php +++ b/application/library/banner/course/Course.php @@ -799,7 +799,7 @@ public function getLinkSetIdsForTerm(osid_id_Id $termId) } $linkSetIds = array_unique($linkSetIds); foreach ($linkSetIds as $key => $val) { - $linkSetIds[$key] = $this->session->getOsidIdFromString($val, 'link_set/'); + $linkSetIds[$key] = $this->session->getOsidIdFromString($val, 'link_set.'); } return new phpkit_id_ArrayIdList($linkSetIds); @@ -830,7 +830,7 @@ public function getLinkTypeIdsForTermAndSet(osid_id_Id $termId, osid_id_Id $link $setId = substr($linkIdString, 1, 1); // The type id is the first charactor. $typeId = substr($linkIdString, 0, 1); - if ($linkSetId->isEqual($this->session->getOsidIdFromString($setId, 'link_set/'))) { + if ($linkSetId->isEqual($this->session->getOsidIdFromString($setId, 'link_set.'))) { $linkTypeIds[] = $typeId; } } @@ -843,7 +843,7 @@ public function getLinkTypeIdsForTermAndSet(osid_id_Id $termId, osid_id_Id $link } foreach ($linkTypeIds as $key => $val) { - $linkTypeIds[$key] = $this->session->getOsidIdFromString($val, 'link_type/'); + $linkTypeIds[$key] = $this->session->getOsidIdFromString($val, 'link_type.'); } return new phpkit_id_ArrayIdList($linkTypeIds); diff --git a/application/library/banner/course/Course/AbstractList.php b/application/library/banner/course/Course/AbstractList.php index 7f2da7cf..da4e2054 100755 --- a/application/library/banner/course/Course/AbstractList.php +++ b/application/library/banner/course/Course/AbstractList.php @@ -254,15 +254,15 @@ protected function includeInactive() final protected function getObjectFromRow(array $row) { return new banner_course_Course( - $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course/'), + $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course.'), $row['SCBCRSE_SUBJ_CODE'].' '.$row['SCBCRSE_CRSE_NUMB'], (null === $row['SCBDESC_TEXT_NARRATIVE']) ? '' : $row['SCBDESC_TEXT_NARRATIVE'], // Description $row['SCBCRSE_TITLE'], $row['SCBCRSE_CREDIT_HR_HIGH'], [ - $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic/subject/'), - $this->session->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic/department/'), - $this->session->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic/division/'), + $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic.subject.'), + $this->session->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic.department.'), + $this->session->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic.division.'), ], $row['has_alternates'], $this->session); diff --git a/application/library/banner/course/Course/AbstractSession.php b/application/library/banner/course/Course/AbstractSession.php index ed5b6f30..0cac8fb1 100755 --- a/application/library/banner/course/Course/AbstractSession.php +++ b/application/library/banner/course/Course/AbstractSession.php @@ -49,7 +49,7 @@ public function getRequirementTopicIdsForCourse(osid_id_Id $courseId) self::$requirementTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$requirementTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SCRATTR_ATTR_CODE'], 'topic/requirement/'); + $topicIds[] = $this->getOsidIdFromString($row['SCRATTR_ATTR_CODE'], 'topic.requirement.'); } self::$requirementTopics_stmt->closeCursor(); @@ -89,7 +89,7 @@ public function getLevelTopicIdsForCourse(osid_id_Id $courseId) self::$levelTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$levelTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic/level/'); + $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic.level.'); } self::$levelTopics_stmt->closeCursor(); diff --git a/application/library/banner/course/Course/Catalog/Session.php b/application/library/banner/course/Course/Catalog/Session.php index b27843ad..fafd9234 100755 --- a/application/library/banner/course/Course/Catalog/Session.php +++ b/application/library/banner/course/Course/Catalog/Session.php @@ -34,7 +34,7 @@ class banner_course_Course_Catalog_Session extends banner_course_Course_Abstract */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** @@ -242,7 +242,7 @@ public function getCatalogIdsByCourse(osid_id_Id $courseId) $ids = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { - $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog/'); + $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog.'); } $statement->closeCursor(); @@ -279,7 +279,7 @@ public function getCatalogsByCourse(osid_id_Id $courseId) $catalogs = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $catalogs[] = new banner_course_CourseCatalog( - $this->getOsidIdFromString($row['catalog_id'], 'catalog/'), + $this->getOsidIdFromString($row['catalog_id'], 'catalog.'), $row['catalog_title']); } $statement->closeCursor(); diff --git a/application/library/banner/course/Course/Lookup/Session.php b/application/library/banner/course/Course/Lookup/Session.php index ceeff4a1..e4180adb 100755 --- a/application/library/banner/course/Course/Lookup/Session.php +++ b/application/library/banner/course/Course/Lookup/Session.php @@ -52,7 +52,7 @@ class banner_course_Course_Lookup_Session extends banner_course_Course_AbstractS */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'course/'); + parent::__construct($manager, 'course.'); $this->catalogId = $catalogId; } @@ -228,7 +228,7 @@ public function getCourse(osid_id_Id $courseId) self::$getCourse_stmts[$catalogWhere] = $this->manager->getDB()->prepare($query); } - $courseIdString = $this->getDatabaseIdString($courseId, 'course/'); + $courseIdString = $this->getDatabaseIdString($courseId, 'course.'); $parameters = array_merge( [ @@ -241,19 +241,19 @@ public function getCourse(osid_id_Id $courseId) self::$getCourse_stmts[$catalogWhere]->closeCursor(); if (!$row || !($row['SCBCRSE_SUBJ_CODE'] && $row['SCBCRSE_CRSE_NUMB'])) { - throw new osid_NotFoundException("Could not find a course matching the id-component '$courseIdString' for the catalog '".$this->getDatabaseIdString($this->getCourseCatalogId(), 'catalog/')."'."); + throw new osid_NotFoundException("Could not find a course matching the id-component '$courseIdString' for the catalog '".$this->getDatabaseIdString($this->getCourseCatalogId(), 'catalog.')."'."); } return new banner_course_Course( - $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course/'), + $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course.'), $row['SCBCRSE_SUBJ_CODE'].' '.$row['SCBCRSE_CRSE_NUMB'], (null === $row['SCBDESC_TEXT_NARRATIVE']) ? '' : $row['SCBDESC_TEXT_NARRATIVE'], // Description $row['SCBCRSE_TITLE'], $row['SCBCRSE_CREDIT_HR_HIGH'], [ - $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic/subject/'), - $this->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic/department/'), - $this->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic/division/'), + $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic.subject.'), + $this->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic.department.'), + $this->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic.division.'), ], $row['has_alternates'], $this); diff --git a/application/library/banner/course/Course/Search/Query.php b/application/library/banner/course/Course/Search/Query.php index bb0a662a..dbf36aa3 100755 --- a/application/library/banner/course/Course/Search/Query.php +++ b/application/library/banner/course/Course/Search/Query.php @@ -575,7 +575,7 @@ public function matchCourseCatalogId(osid_id_Id $courseCatalogId, $match) course_catalog_college WHERE catalog_id = ?)', - [$this->session->getDatabaseIdString($courseCatalogId, 'catalog/')], + [$this->session->getDatabaseIdString($courseCatalogId, 'catalog.')], $match); } @@ -752,7 +752,7 @@ public function getTopicQuery() */ public function matchInstructorId(osid_id_Id $instructorId, $match) { - $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource/person/')], $match); + $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource.person.')], $match); $this->addTableJoin('LEFT JOIN SSBSECT ON (SCBCRSE_SUBJ_CODE = SSBSECT_SUBJ_CODE AND SCBCRSE_CRSE_NUMB = SSBSECT_CRSE_NUMB)'); $this->addTableJoin('LEFT JOIN SYVINST ON (SYVINST_TERM_CODE = SSBSECT_TERM_CODE AND SYVINST_CRN = SSBSECT_CRN)'); @@ -810,7 +810,7 @@ public function getInstructorQuery() */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term_id', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term_id', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); $this->addTableJoin('LEFT JOIN SSBSECT ON (SCBCRSE_SUBJ_CODE = SSBSECT_SUBJ_CODE AND SCBCRSE_CRSE_NUMB = SSBSECT_CRSE_NUMB)'); $this->addClause('active_sections', 'SSBSECT_SSTS_CODE = ? AND (course_catalog.prnt_ind_to_exclude IS NULL OR SSBSECT_PRNT_IND != course_catalog.prnt_ind_to_exclude)', ['A'], true); @@ -867,7 +867,7 @@ public function getTermQuery() */ public function matchLocationId(osid_id_Id $instructorId, $match) { - $this->addClause('location_id', 'SSBSECT_CAMP_CODE = ?', [$this->session->getDatabaseIdString($instructorId, 'resource/place/campus/')], $match); + $this->addClause('location_id', 'SSBSECT_CAMP_CODE = ?', [$this->session->getDatabaseIdString($instructorId, 'resource.place.campus.')], $match); $this->addTableJoin('LEFT JOIN SSBSECT ON (SCBCRSE_SUBJ_CODE = SSBSECT_SUBJ_CODE AND SCBCRSE_CRSE_NUMB = SSBSECT_CRSE_NUMB)'); $this->addClause('active_sections', 'SSBSECT_SSTS_CODE = ? AND (course_catalog.prnt_ind_to_exclude IS NULL OR SSBSECT_PRNT_IND != course_catalog.prnt_ind_to_exclude)', ['A'], true); diff --git a/application/library/banner/course/Course/Search/Session.php b/application/library/banner/course/Course/Search/Session.php index ffe6435d..0fbbb474 100755 --- a/application/library/banner/course/Course/Search/Session.php +++ b/application/library/banner/course/Course/Search/Session.php @@ -45,7 +45,7 @@ class banner_course_Course_Search_Session extends banner_course_Course_AbstractS */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } diff --git a/application/library/banner/course/CourseCatalog/Lookup/Session.php b/application/library/banner/course/CourseCatalog/Lookup/Session.php index 6ef0d69d..b0b09f6e 100755 --- a/application/library/banner/course/CourseCatalog/Lookup/Session.php +++ b/application/library/banner/course/CourseCatalog/Lookup/Session.php @@ -48,7 +48,7 @@ class banner_course_CourseCatalog_Lookup_Session extends banner_course_AbstractS */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** diff --git a/application/library/banner/course/CourseManager.php b/application/library/banner/course/CourseManager.php index 7507cac2..d504a41f 100755 --- a/application/library/banner/course/CourseManager.php +++ b/application/library/banner/course/CourseManager.php @@ -35,7 +35,7 @@ public function __construct() { parent::__construct(); - $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations/banner_course')); + $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations.banner_course')); $this->setDisplayName('Banner Course Manager'); $this->setDescription('This is a CourseManager implementation that provides read-only, unauthenticated, access to course information stored in Banner database tables.'); } @@ -76,7 +76,7 @@ public function getIdAuthority() */ public function getCombinedCatalogId() { - return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'catalog/all'); + return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'catalog.all'); } /********************************************************* @@ -118,17 +118,17 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $dsn = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_dsn'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_dsn'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $username = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_username'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_username'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $password = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_password'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_password'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode(), $e); @@ -137,7 +137,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $debug = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_count_queries'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_count_queries'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/Boolean')); } catch (osid_ConfigurationErrorException $e) { $debug = false; @@ -147,7 +147,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) $driverOptions = []; $options = phpkit_configuration_ConfigUtil::getMultiValuedValueOfAnyType( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_driver_options')); + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_driver_options')); foreach ($options as $key => $value) { $option = constant($key); if (null === $option) { @@ -172,10 +172,10 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $this->idAuthority = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/id_authority'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.id_authority'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); if (!strlen($this->idAuthority)) { - throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course/id_authority must be specified.'); + throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course.id_authority must be specified.'); } } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode(), $e); @@ -213,7 +213,7 @@ public function shutdown() public function getCourseLookupSession() { return new banner_course_Course_Lookup_CombinedSession($this, - new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog/all')); + new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog.all')); } /** @@ -268,7 +268,7 @@ public function getCourseLookupSessionForCatalog(osid_id_Id $courseCatalogId) public function getCourseSearchSession() { return new banner_course_Course_Search_Session($this, - new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog/all')); + new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog.all')); } /** diff --git a/application/library/banner/course/CourseOffering.php b/application/library/banner/course/CourseOffering.php index 1d714f31..dc6ce2b8 100755 --- a/application/library/banner/course/CourseOffering.php +++ b/application/library/banner/course/CourseOffering.php @@ -117,7 +117,7 @@ public function __construct(array $row, banner_course_CourseOffering_SessionInte $this->setGenusType(new phpkit_type_Type( 'urn', // namespace $this->session->getIdAuthority(), // id authority - 'genera:offering/'.$row['STVSCHD_CODE'], // identifier + 'genera:offering.'.$row['STVSCHD_CODE'], // identifier 'Course Offerings', // domain trim($row['STVSCHD_DESC']), // display name trim($row['STVSCHD_CODE']) // display label @@ -350,10 +350,10 @@ public function getTermId() { $termCode = $this->row['SSBSECT_TERM_CODE']; if (!empty($this->row['SSBSECT_PTRM_CODE']) && 1 != $this->row['SSBSECT_PTRM_CODE']) { - $termCode .= '/'.$this->row['SSBSECT_PTRM_CODE']; + $termCode .= '.'.$this->row['SSBSECT_PTRM_CODE']; } - return $this->getOsidIdFromString($termCode, 'term/'); + return $this->getOsidIdFromString($termCode, 'term.'); } /** @@ -387,16 +387,16 @@ public function getTopicIds() if (!isset($this->topicIds)) { $this->topicIds = []; if ($this->row['SCBCRSE_DEPT_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DEPT_CODE'], 'topic/department/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DEPT_CODE'], 'topic.department.'); } if ($this->row['SSBSECT_SUBJ_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['SSBSECT_SUBJ_CODE'], 'topic/subject/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['SSBSECT_SUBJ_CODE'], 'topic.subject.'); } if ($this->row['SCBCRSE_DIVS_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DIVS_CODE'], 'topic/division/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DIVS_CODE'], 'topic.division.'); } if ($this->row['GTVINSM_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['GTVINSM_CODE'], 'topic/instruction_method/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['GTVINSM_CODE'], 'topic.instruction_method.'); } $this->topicIds = array_merge( @@ -484,8 +484,8 @@ public function hasLocation() public function getLocationId() { return $this->getOsidIdFromString( - $this->row['SSRMEET_BLDG_CODE'].'/'.$this->row['SSRMEET_ROOM_CODE'], - 'resource/place/room/'); + $this->row['SSRMEET_BLDG_CODE'].'.'.$this->row['SSRMEET_ROOM_CODE'], + 'resource.place.room.'); } /** @@ -633,8 +633,8 @@ public function getCalendarId() throw new osid_IllegalStateException('This version of the OSID does not support Learning Objectives'); return $this->getOsidIdFromString( - $this->row['SSBSECT_TERM_CODE'].'/'.$this->row['SSBSECT_CRN'], - 'CourseSchedule/'); + $this->row['SSBSECT_TERM_CODE'].'.'.$this->row['SSBSECT_CRN'], + 'CourseSchedule.'); } /** @@ -879,7 +879,7 @@ public function getLinkSetId() $linkId = substr($this->row['SSBSECT_LINK_IDENT'], 1, 1); } - return $this->getOsidIdFromString($linkId, 'link_set/'); + return $this->getOsidIdFromString($linkId, 'link_set.'); } /** @@ -907,7 +907,7 @@ public function getLinkTypeId() $linkId = substr($this->row['SSBSECT_LINK_IDENT'], 0, 1); } - return $this->getOsidIdFromString($linkId, 'link_type/'); + return $this->getOsidIdFromString($linkId, 'link_type.'); } /********************************************************* diff --git a/application/library/banner/course/CourseOffering/AbstractSession.php b/application/library/banner/course/CourseOffering/AbstractSession.php index 94422035..2cb3e26f 100755 --- a/application/library/banner/course/CourseOffering/AbstractSession.php +++ b/application/library/banner/course/CourseOffering/AbstractSession.php @@ -28,7 +28,7 @@ public function getInstructorIdsForOffering(osid_id_Id $offeringId) { $ids = []; foreach ($this->getInstructorDataForOffering($offeringId) as $row) { - $ids[] = $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'); + $ids[] = $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'); } return new phpkit_id_ArrayIdList($ids); @@ -46,7 +46,7 @@ public function getInstructorsForOffering(osid_id_Id $offeringId) $people = []; foreach ($this->getInstructorDataForOffering($offeringId) as $row) { $people[] = new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -190,7 +190,7 @@ public function getRequirementTopicIdsForCourseOffering(osid_id_Id $courseOfferi self::$requirementTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$requirementTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SSRATTR_ATTR_CODE'], 'topic/requirement/'); + $topicIds[] = $this->getOsidIdFromString($row['SSRATTR_ATTR_CODE'], 'topic.requirement.'); } self::$requirementTopics_stmt->closeCursor(); @@ -231,7 +231,7 @@ public function getLevelTopicIdsForCourseOffering(osid_id_Id $courseOfferingId) self::$levelTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$levelTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic/level/'); + $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic.level.'); } self::$levelTopics_stmt->closeCursor(); @@ -271,7 +271,7 @@ public function getBlockTopicIdsForCourseOffering(osid_id_Id $courseOfferingId) self::$blockTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$blockTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SSRBLCK_BLCK_CODE'], 'topic/block/'); + $topicIds[] = $this->getOsidIdFromString($row['SSRBLCK_BLCK_CODE'], 'topic.block.'); } self::$blockTopics_stmt->closeCursor(); diff --git a/application/library/banner/course/CourseOffering/Catalog/Session.php b/application/library/banner/course/CourseOffering/Catalog/Session.php index 362a5d85..11762f30 100755 --- a/application/library/banner/course/CourseOffering/Catalog/Session.php +++ b/application/library/banner/course/CourseOffering/Catalog/Session.php @@ -35,7 +35,7 @@ class banner_course_CourseOffering_Catalog_Session extends banner_course_CourseO */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** @@ -244,7 +244,7 @@ public function getCatalogIdsByCourseOffering(osid_id_Id $courseOfferingId) $ids = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { - $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog/'); + $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog.'); } $statement->closeCursor(); @@ -281,7 +281,7 @@ public function getCatalogsByCourseOffering(osid_id_Id $courseOfferingId) $catalogs = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $catalogs[] = new banner_course_CourseCatalog( - $this->getOsidIdFromString($row['catalog_id'], 'catalog/'), + $this->getOsidIdFromString($row['catalog_id'], 'catalog.'), $row['catalog_title']); } $statement->closeCursor(); diff --git a/application/library/banner/course/CourseOffering/GenusTypeList.php b/application/library/banner/course/CourseOffering/GenusTypeList.php index 05644c3d..04121ae1 100755 --- a/application/library/banner/course/CourseOffering/GenusTypeList.php +++ b/application/library/banner/course/CourseOffering/GenusTypeList.php @@ -121,7 +121,7 @@ protected function getObjectFromRow(array $row) return new phpkit_type_Type( 'urn', // namespace $this->session->getIdAuthority(), // id authority - 'genera:offering/'.$row['STVSCHD_CODE'], // identifier + 'genera:offering.'.$row['STVSCHD_CODE'], // identifier 'Course Offerings', // domain $row['STVSCHD_DESC'], // display name $row['STVSCHD_CODE'] // display label diff --git a/application/library/banner/course/CourseOffering/Lookup/Session.php b/application/library/banner/course/CourseOffering/Lookup/Session.php index 10e34c1b..af38f847 100755 --- a/application/library/banner/course/CourseOffering/Lookup/Session.php +++ b/application/library/banner/course/CourseOffering/Lookup/Session.php @@ -47,7 +47,7 @@ class banner_course_CourseOffering_Lookup_Session extends banner_course_CourseOf */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } diff --git a/application/library/banner/course/CourseOffering/Search/Query.php b/application/library/banner/course/CourseOffering/Search/Query.php index e6a6e20f..103b6ba7 100755 --- a/application/library/banner/course/CourseOffering/Search/Query.php +++ b/application/library/banner/course/CourseOffering/Search/Query.php @@ -256,7 +256,7 @@ private function getGenusTypeCode(osid_type_Type $genusType) return null; } - if (!preg_match('/^genera:offering\/([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { + if (!preg_match('/^genera:offering\.([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { return null; } @@ -895,8 +895,8 @@ public function matchLocationId(osid_id_Id $resourceId, $match) { // Try room locations try { - $locationString = $this->session->getDatabaseIdString($resourceId, 'resource/place/room/'); - $locationParts = explode('/', $locationString); + $locationString = $this->session->getDatabaseIdString($resourceId, 'resource.place.room.'); + $locationParts = explode('.', $locationString); $this->addClause( 'location', '(SSRMEET_BLDG_CODE = ? AND SSRMEET_ROOM_CODE = ?)', @@ -906,7 +906,7 @@ public function matchLocationId(osid_id_Id $resourceId, $match) // Try building locations catch (osid_NotFoundException $e) { try { - $building = $this->session->getDatabaseIdString($resourceId, 'resource/place/building/'); + $building = $this->session->getDatabaseIdString($resourceId, 'resource.place.building.'); $this->addClause( 'location', 'SSRMEET_BLDG_CODE = ?', @@ -915,7 +915,7 @@ public function matchLocationId(osid_id_Id $resourceId, $match) } // Try campus locations catch (osid_NotFoundException $e) { - $campus = $this->session->getDatabaseIdString($resourceId, 'resource/place/campus/'); + $campus = $this->session->getDatabaseIdString($resourceId, 'resource.place.campus.'); $this->addClause( 'location', 'SSBSECT_CAMP_CODE = ?', @@ -1178,8 +1178,8 @@ public function matchCourseCatalogId(osid_id_Id $courseCatalogId, $match) catalog_id = ? ))', [ - $this->session->getDatabaseIdString($courseCatalogId, 'catalog/'), - $this->session->getDatabaseIdString($courseCatalogId, 'catalog/'), + $this->session->getDatabaseIdString($courseCatalogId, 'catalog.'), + $this->session->getDatabaseIdString($courseCatalogId, 'catalog.'), ], $match); } @@ -1273,7 +1273,7 @@ public function matchAnyURL($match) */ public function matchInstructorId(osid_id_Id $instructorId, $match) { - $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource/person/')], $match); + $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource.person.')], $match); $this->addTableJoin('LEFT JOIN SYVINST ON (SYVINST_TERM_CODE = SSBSECT_TERM_CODE AND SYVINST_CRN = SSBSECT_CRN)'); } diff --git a/application/library/banner/course/CourseOffering/Search/Session.php b/application/library/banner/course/CourseOffering/Search/Session.php index 3c645e4f..9073d072 100755 --- a/application/library/banner/course/CourseOffering/Search/Session.php +++ b/application/library/banner/course/CourseOffering/Search/Session.php @@ -47,7 +47,7 @@ class banner_course_CourseOffering_Search_Session extends banner_course_CourseOf */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } @@ -269,12 +269,12 @@ public function buildIndex($displayStatus = false) $offerings = $lookupSession->getCourseOfferings(); // Known topic types - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); // Known record types $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); @@ -296,7 +296,7 @@ public function buildIndex($displayStatus = false) if (!$insertStmt->execute([':term_code' => $termCode, ':crn' => $crn, ':text' => $text])) { $info = $insertStmt->errorInfo(); - throw new osid_OperationFailedException('FullText update failed with code '.$info[0].'/'.$info[1].' - '.$info[2]); + throw new osid_OperationFailedException('FullText update failed with code '.$info[0].'.'.$info[1].' - '.$info[2]); } } catch (Exception $e) { echo "\nError of type:\n\t".$e::class."\nwith message:\n\t".$e->getMessage()."\n"; diff --git a/application/library/banner/course/Term/Catalog/Session.php b/application/library/banner/course/Term/Catalog/Session.php index b9aba1fa..c1e7c2d5 100755 --- a/application/library/banner/course/Term/Catalog/Session.php +++ b/application/library/banner/course/Term/Catalog/Session.php @@ -34,7 +34,7 @@ class banner_course_Term_Catalog_Session extends banner_course_AbstractSession i */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** @@ -232,14 +232,14 @@ public function getTermsByCatalogs(osid_id_IdList $courseCatalogIdList) public function getCatalogIdsByTerm(osid_id_Id $termId) { $parameters = [ - ':section_term_code' => $this->getDatabaseIdString($termId, 'term/'), + ':section_term_code' => $this->getDatabaseIdString($termId, 'term.'), ]; $statement = $this->getGetCatalogsStatement(); $statement->execute($parameters); $ids = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { - $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog/'); + $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog.'); } $statement->closeCursor(); @@ -267,7 +267,7 @@ public function getCatalogIdsByTerm(osid_id_Id $termId) public function getCatalogsByTerm(osid_id_Id $termId) { $parameters = [ - ':section_term_code' => $this->getDatabaseIdString($termId, 'term/'), + ':section_term_code' => $this->getDatabaseIdString($termId, 'term.'), ]; $statement = $this->getGetCatalogsStatement(); $statement->execute($parameters); @@ -275,7 +275,7 @@ public function getCatalogsByTerm(osid_id_Id $termId) $catalogs = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $catalogs[] = new banner_course_CourseCatalog( - $this->getOsidIdFromString($row['catalog_id'], 'catalog/'), + $this->getOsidIdFromString($row['catalog_id'], 'catalog.'), $row['catalog_title']); } $statement->closeCursor(); diff --git a/application/library/banner/course/Term/ForCourseList.php b/application/library/banner/course/Term/ForCourseList.php index 1c17f68d..6e1dfc3f 100755 --- a/application/library/banner/course/Term/ForCourseList.php +++ b/application/library/banner/course/Term/ForCourseList.php @@ -114,7 +114,7 @@ private function getAllInputParameters() protected function getObjectFromRow(array $row) { return new banner_course_Term( - $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term/'), + $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term.'), $row['STVTERM_DESC'], $row['STVTERM_START_DATE'], $row['STVTERM_END_DATE']); diff --git a/application/library/banner/course/Term/Lookup/AllList.php b/application/library/banner/course/Term/Lookup/AllList.php index b74ee291..a49758a5 100755 --- a/application/library/banner/course/Term/Lookup/AllList.php +++ b/application/library/banner/course/Term/Lookup/AllList.php @@ -95,7 +95,7 @@ private function getAllInputParameters() protected function getObjectFromRow(array $row) { return new banner_course_Term( - $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term/'), + $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term.'), $row['STVTERM_DESC'], $row['STVTERM_START_DATE'], $row['STVTERM_END_DATE']); diff --git a/application/library/banner/course/Term/Lookup/Session.php b/application/library/banner/course/Term/Lookup/Session.php index ec9bcd18..116ac0b0 100755 --- a/application/library/banner/course/Term/Lookup/Session.php +++ b/application/library/banner/course/Term/Lookup/Session.php @@ -48,7 +48,7 @@ class banner_course_Term_Lookup_Session extends banner_course_AbstractSession im */ public function __construct(banner_course_CourseManagerInterface $manager, ?osid_id_Id $catalogId = null) { - parent::__construct($manager, 'term/'); + parent::__construct($manager, 'term.'); if (null === $catalogId) { $this->catalogId = $manager->getCombinedCatalogId(); @@ -187,8 +187,8 @@ public function useIsolatedCourseCatalogView() */ public function getTerm(osid_id_Id $termId) { - $idString = $this->getDatabaseIdString($termId, 'term/'); - if (!preg_match('/^([0-9]{6})(?:\/([a-z0-9]{1,3}))?$/i', $idString, $matches)) { + $idString = $this->getDatabaseIdString($termId, 'term.'); + if (!preg_match('/^([0-9]{6})(?:\.([a-z0-9]{1,3}))?$/i', $idString, $matches)) { throw new osid_NotFoundException('Term id component \''.$idString.'\' could not be converted to a term code.'); } @@ -255,7 +255,7 @@ protected function getBaseTerm($idString) } return new banner_course_Term( - $this->getOsidIdFromString($row['STVTERM_CODE'], 'term/'), + $this->getOsidIdFromString($row['STVTERM_CODE'], 'term.'), $row['STVTERM_DESC'], $row['STVTERM_START_DATE'], $row['STVTERM_END_DATE']); @@ -341,7 +341,7 @@ protected function getPartOfTerm($termCode, $pTermCode) } return new banner_course_Term( - $this->getOsidIdFromString($row['STVTERM_CODE'].'/'.$row['SOBPTRM_PTRM_CODE'], 'term/'), + $this->getOsidIdFromString($row['STVTERM_CODE'].'.'.$row['SOBPTRM_PTRM_CODE'], 'term.'), $desc, $startDate, $endDate); @@ -374,7 +374,7 @@ private function getCatalogParameters() { $params = []; if (null !== $this->catalogId && !$this->catalogId->isEqual($this->getCombinedCatalogId())) { - $params[':catalog_id'] = $this->getDatabaseIdString($this->catalogId, 'catalog/'); + $params[':catalog_id'] = $this->getDatabaseIdString($this->catalogId, 'catalog.'); } return $params; diff --git a/application/library/banner/course/Topic/AbstractList.php b/application/library/banner/course/Topic/AbstractList.php index bbd3bb52..fc10c13d 100755 --- a/application/library/banner/course/Topic/AbstractList.php +++ b/application/library/banner/course/Topic/AbstractList.php @@ -566,10 +566,10 @@ abstract protected function includeSubjects(); final protected function getObjectFromRow(array $row) { return new banner_course_Topic( - $this->session->getOsidIdFromString($row['type'].'/'.$row['id'], 'topic/'), + $this->session->getOsidIdFromString($row['type'].'.'.$row['id'], 'topic.'), trim($row['display_name']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/'.$row['type']) + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.'.$row['type']) ); } diff --git a/application/library/banner/course/Topic/Lookup/Session.php b/application/library/banner/course/Topic/Lookup/Session.php index 8c9c5e3c..07e79b77 100755 --- a/application/library/banner/course/Topic/Lookup/Session.php +++ b/application/library/banner/course/Topic/Lookup/Session.php @@ -46,7 +46,7 @@ class banner_course_Topic_Lookup_Session extends banner_course_AbstractSession i */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } @@ -215,8 +215,8 @@ public function getTopic(osid_id_Id $topicId) */ public function getTopicType(osid_id_Id $topicId) { - $string = $this->getDatabaseIdString($topicId, 'topic/'); - if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method)/.+#', $string, $matches)) { + $string = $this->getDatabaseIdString($topicId, 'topic.'); + if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method)..+#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a topic type.'); } @@ -232,8 +232,8 @@ public function getTopicType(osid_id_Id $topicId) */ public function getTopicValue(osid_id_Id $topicId) { - $string = $this->getDatabaseIdString($topicId, 'topic/'); - if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($topicId, 'topic.'); + if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method).(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a topic type.'); } @@ -278,7 +278,7 @@ private function getSubjectTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':subject_code' => $this->getDatabaseIdString($topicId, 'topic/subject/'), + ':subject_code' => $this->getDatabaseIdString($topicId, 'topic.subject.'), ], $this->getCatalogParameters()); self::$getSubjectTopic_stmts[$catalogWhere]->execute($parameters); @@ -286,14 +286,14 @@ private function getSubjectTopic(osid_id_Id $topicId) self::$getSubjectTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVSUBJ_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the subject code '.$this->getDatabaseIdString($topicId, 'topic/subject/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the subject code '.$this->getDatabaseIdString($topicId, 'topic.subject.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic/subject/'), + $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic.subject.'), trim($row['STVSUBJ_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject') ); } @@ -339,10 +339,10 @@ private function getSubjectTopics() $topics = []; while ($row = self::$getSubjectTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic/subject/'), + $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic.subject.'), trim($row['STVSUBJ_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject') ); } self::$getSubjectTopics_stmts[$catalogWhere]->closeCursor(); @@ -388,7 +388,7 @@ private function getDepartmentTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':department_code' => $this->getDatabaseIdString($topicId, 'topic/department/'), + ':department_code' => $this->getDatabaseIdString($topicId, 'topic.department.'), ], $this->getCatalogParameters()); self::$getDepartmentTopic_stmts[$catalogWhere]->execute($parameters); @@ -396,14 +396,14 @@ private function getDepartmentTopic(osid_id_Id $topicId) self::$getDepartmentTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVDEPT_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the department code '.$this->getDatabaseIdString($topicId, 'topic/department/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the department code '.$this->getDatabaseIdString($topicId, 'topic.department.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic/department/'), + $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic.department.'), trim($row['STVDEPT_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department') ); } @@ -448,10 +448,10 @@ private function getDepartmentTopics() $topics = []; while ($row = self::$getDepartmentTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic/department/'), + $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic.department.'), trim($row['STVDEPT_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department') ); } self::$getDepartmentTopics_stmts[$catalogWhere]->closeCursor(); @@ -497,7 +497,7 @@ private function getDivisionTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':division_code' => $this->getDatabaseIdString($topicId, 'topic/division/'), + ':division_code' => $this->getDatabaseIdString($topicId, 'topic.division.'), ], $this->getCatalogParameters()); self::$getDivisionTopic_stmts[$catalogWhere]->execute($parameters); @@ -505,14 +505,14 @@ private function getDivisionTopic(osid_id_Id $topicId) self::$getDivisionTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVDIVS_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the division code '.$this->getDatabaseIdString($topicId, 'topic/division/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the division code '.$this->getDatabaseIdString($topicId, 'topic.division.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic/division/'), + $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic.division.'), trim($row['STVDIVS_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division') ); } @@ -557,10 +557,10 @@ private function getDivisionTopics() $topics = []; while ($row = self::$getDivisionTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic/division/'), + $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic.division.'), trim($row['STVDIVS_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division') ); } self::$getDivisionTopics_stmts[$catalogWhere]->closeCursor(); @@ -626,7 +626,7 @@ private function getRequirementTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':requirement_code' => $this->getDatabaseIdString($topicId, 'topic/requirement/'), + ':requirement_code' => $this->getDatabaseIdString($topicId, 'topic.requirement.'), ], $this->getCatalogParameters()); self::$getRequirementTopic_stmts[$catalogWhere]->execute($parameters); @@ -640,15 +640,15 @@ private function getRequirementTopic(osid_id_Id $topicId) self::$getCourseRequirementTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVATTR_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the requirement code '.$this->getDatabaseIdString($topicId, 'topic/requirement/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the requirement code '.$this->getDatabaseIdString($topicId, 'topic.requirement.').'.'); } } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic/requirement/'), + $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic.requirement.'), trim($row['STVATTR_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement') ); } @@ -687,10 +687,10 @@ private function getRequirementTopics() $topics = []; while ($row = self::$getRequirementTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic/requirement/'), + $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic.requirement.'), trim($row['STVATTR_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement') ); } self::$getRequirementTopics_stmts[$catalogWhere]->closeCursor(); @@ -737,7 +737,7 @@ private function getLevelTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':level_code' => $this->getDatabaseIdString($topicId, 'topic/level/'), + ':level_code' => $this->getDatabaseIdString($topicId, 'topic.level.'), ], $this->getCatalogParameters()); self::$getLevelTopic_stmts[$catalogWhere]->execute($parameters); @@ -745,14 +745,14 @@ private function getLevelTopic(osid_id_Id $topicId) self::$getLevelTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVLEVL_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the level code '.$this->getDatabaseIdString($topicId, 'topic/level/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the level code '.$this->getDatabaseIdString($topicId, 'topic.level.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic/level/'), + $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic.level.'), trim($row['STVLEVL_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level') ); } @@ -798,10 +798,10 @@ private function getLevelTopics() $topics = []; while ($row = self::$getLevelTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic/level/'), + $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic.level.'), trim($row['STVLEVL_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level') ); } self::$getLevelTopics_stmts[$catalogWhere]->closeCursor(); @@ -841,7 +841,7 @@ private function getBlockTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':block_code' => $this->getDatabaseIdString($topicId, 'topic/block/'), + ':block_code' => $this->getDatabaseIdString($topicId, 'topic.block.'), ], $this->getCatalogParameters()); self::$getBlockTopic_stmts[$catalogWhere]->execute($parameters); @@ -849,14 +849,14 @@ private function getBlockTopic(osid_id_Id $topicId) self::$getBlockTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVBLCK_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the block code '.$this->getDatabaseIdString($topicId, 'topic/block/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the block code '.$this->getDatabaseIdString($topicId, 'topic.block.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic/block/'), + $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic.block.'), trim($row['STVBLCK_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block') ); } @@ -895,10 +895,10 @@ private function getBlockTopics() $topics = []; while ($row = self::$getBlockTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic/block/'), + $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic.block.'), trim($row['STVBLCK_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block') ); } self::$getBlockTopics_stmts[$catalogWhere]->closeCursor(); @@ -938,7 +938,7 @@ private function getInstructionMethodTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':insm_code' => $this->getDatabaseIdString($topicId, 'topic/instruction_method/'), + ':insm_code' => $this->getDatabaseIdString($topicId, 'topic.instruction_method.'), ], $this->getCatalogParameters()); self::$getInstructionMethodTopic_stmts[$catalogWhere]->execute($parameters); @@ -946,14 +946,14 @@ private function getInstructionMethodTopic(osid_id_Id $topicId) self::$getInstructionMethodTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['GTVINSM_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the instruction_method code '.$this->getDatabaseIdString($topicId, 'topic/instruction_method/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the instruction_method code '.$this->getDatabaseIdString($topicId, 'topic.instruction_method.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic/instruction_method/'), + $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic.instruction_method.'), trim($row['GTVINSM_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method') ); } @@ -992,10 +992,10 @@ private function getInstructionMethodTopics() $topics = []; while ($row = self::$getInstructionMethodTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic/instruction_method/'), + $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic.instruction_method.'), trim($row['GTVINSM_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method') ); } self::$getInstructionMethodTopics_stmts[$catalogWhere]->closeCursor(); @@ -1111,19 +1111,19 @@ public function getTopicsByGenusType(osid_type_Type $topicGenusType) return new phpkit_EmptyList('osid_course_TopicList'); } switch ($topicGenusType->getIdentifier()) { - case 'genera:topic/subject': + case 'genera:topic.subject': return $this->getSubjectTopics(); - case 'genera:topic/department': + case 'genera:topic.department': return $this->getDepartmentTopics(); - case 'genera:topic/division': + case 'genera:topic.division': return $this->getDivisionTopics(); - case 'genera:topic/requirement': + case 'genera:topic.requirement': return $this->getRequirementTopics(); - case 'genera:topic/level': + case 'genera:topic.level': return $this->getLevelTopics(); - case 'genera:topic/block': + case 'genera:topic.block': return $this->getBlockTopics(); - case 'genera:topic/instruction_method': + case 'genera:topic.instruction_method': return $this->getInstructionMethodTopics(); default: return new phpkit_EmptyList('osid_course_TopicList'); diff --git a/application/library/banner/course/Topic/Search/Query.php b/application/library/banner/course/Topic/Search/Query.php index b17c2f77..3ccff3c3 100755 --- a/application/library/banner/course/Topic/Search/Query.php +++ b/application/library/banner/course/Topic/Search/Query.php @@ -39,13 +39,13 @@ public function __construct(banner_course_SessionInterface $session) $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); $this->toInclude = []; } diff --git a/application/library/banner/course/Topic/Search/Query/Block.php b/application/library/banner/course/Topic/Search/Query/Block.php index 10c04d1b..0038fc65 100755 --- a/application/library/banner/course/Topic/Search/Query/Block.php +++ b/application/library/banner/course/Topic/Search/Query/Block.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Department.php b/application/library/banner/course/Topic/Search/Query/Department.php index 452c344a..e98ff86b 100755 --- a/application/library/banner/course/Topic/Search/Query/Department.php +++ b/application/library/banner/course/Topic/Search/Query/Department.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Division.php b/application/library/banner/course/Topic/Search/Query/Division.php index 390e735b..95f29e51 100755 --- a/application/library/banner/course/Topic/Search/Query/Division.php +++ b/application/library/banner/course/Topic/Search/Query/Division.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/InstructionMethod.php b/application/library/banner/course/Topic/Search/Query/InstructionMethod.php index 154b90d1..6d816c30 100644 --- a/application/library/banner/course/Topic/Search/Query/InstructionMethod.php +++ b/application/library/banner/course/Topic/Search/Query/InstructionMethod.php @@ -375,6 +375,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Level.php b/application/library/banner/course/Topic/Search/Query/Level.php index 058bada9..8642814e 100755 --- a/application/library/banner/course/Topic/Search/Query/Level.php +++ b/application/library/banner/course/Topic/Search/Query/Level.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Requirement.php b/application/library/banner/course/Topic/Search/Query/Requirement.php index 2572290e..f9bf8237 100755 --- a/application/library/banner/course/Topic/Search/Query/Requirement.php +++ b/application/library/banner/course/Topic/Search/Query/Requirement.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Subject.php b/application/library/banner/course/Topic/Search/Query/Subject.php index d180982f..06f74654 100755 --- a/application/library/banner/course/Topic/Search/Query/Subject.php +++ b/application/library/banner/course/Topic/Search/Query/Subject.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Session.php b/application/library/banner/course/Topic/Search/Session.php index 4c0bc9f5..36c4fecf 100755 --- a/application/library/banner/course/Topic/Search/Session.php +++ b/application/library/banner/course/Topic/Search/Session.php @@ -45,7 +45,7 @@ class banner_course_Topic_Search_Session extends banner_course_AbstractSession i */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } diff --git a/application/library/banner/resource/Bin/Lookup/Session.php b/application/library/banner/resource/Bin/Lookup/Session.php index de76dc68..8d972c8e 100755 --- a/application/library/banner/resource/Bin/Lookup/Session.php +++ b/application/library/banner/resource/Bin/Lookup/Session.php @@ -40,7 +40,7 @@ class banner_resource_Bin_Lookup_Session extends banner_AbstractSession implemen */ public function __construct(banner_ManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** diff --git a/application/library/banner/resource/Resource/Building.php b/application/library/banner/resource/Resource/Building.php index 3c467717..59d4ccd9 100644 --- a/application/library/banner/resource/Resource/Building.php +++ b/application/library/banner/resource/Resource/Building.php @@ -39,7 +39,7 @@ public function __construct(osid_id_Id $id, $displayName, $code) $this->setId($id); $this->setDisplayName($displayName); $this->setDescription($code); - $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/building')); + $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.building')); $this->buildingDisplayName = $displayName; $this->buildingCode = $code; diff --git a/application/library/banner/resource/Resource/Lookup/CombinedSession.php b/application/library/banner/resource/Resource/Lookup/CombinedSession.php index 08445eba..9e4b368d 100755 --- a/application/library/banner/resource/Resource/Lookup/CombinedSession.php +++ b/application/library/banner/resource/Resource/Lookup/CombinedSession.php @@ -45,7 +45,7 @@ class banner_resource_Resource_Lookup_CombinedSession extends banner_AbstractSes */ public function __construct(banner_ManagerInterface $manager) { - parent::__construct($manager, 'resource/'); + parent::__construct($manager, 'resource.'); } /** @@ -181,11 +181,11 @@ public function getResource(osid_id_Id $resourceId) switch ($type) { case 'person': return $this->getPersonResource($resourceId); - case 'place/room': + case 'place.room': return $this->getRoomResource($resourceId); - case 'place/building': + case 'place.building': return $this->getBuildingResource($resourceId); - case 'place/campus': + case 'place.campus': return $this->getCampusResource($resourceId); default: throw new osid_NotFoundException('No resource found with category '.$type); @@ -201,8 +201,8 @@ public function getResource(osid_id_Id $resourceId) */ public function getResourceType(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -218,8 +218,8 @@ public function getResourceType(osid_id_Id $resourceId) */ public function getResourceValue(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -252,18 +252,18 @@ private function getPersonResource(osid_id_Id $resourceId) } $parameters = [ - ':webid' => $this->getDatabaseIdString($resourceId, 'resource/person/'), + ':webid' => $this->getDatabaseIdString($resourceId, 'resource.person.'), ]; self::$getPersonResource_stmt->execute($parameters); $row = self::$getPersonResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getPersonResource_stmt->closeCursor(); if (!$row['WEB_ID']) { - throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource/person/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource.person.').'.'); } return new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -298,7 +298,7 @@ private function getPersonResources() $resources = []; while ($row = self::$getPersonResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -333,18 +333,18 @@ private function getBuildingResource(osid_id_Id $resourceId) } $parameters = [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/building/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.building.'), ]; self::$getBuildingResource_stmt->execute($parameters); $row = self::$getBuildingResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getBuildingResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource/place/building/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource.place.building.').'.'); } return new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -377,7 +377,7 @@ private function getBuildingResources() $resources = []; while ($row = self::$getBuildingResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -416,8 +416,8 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt = $this->manager->getDB()->prepare($query); } - $roomString = $this->getDatabaseIdString($resourceId, 'resource/place/room/'); - if (!preg_match('#^([a-z0-9_-]+)/(.+)$#i', $roomString, $matches)) { + $roomString = $this->getDatabaseIdString($resourceId, 'resource.place.room.'); + if (!preg_match('#^([a-z0-9_-]+)\.(.+)$#i', $roomString, $matches)) { throw new osid_NotFoundException("Room string '$roomString' doesn't match."); } @@ -430,11 +430,11 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource/place/room/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource.place.room.').'.'); } return new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -474,7 +474,7 @@ private function getRoomResources() $resources = []; while ($row = self::$getRoomResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -510,21 +510,21 @@ private function getCampusResource(osid_id_Id $resourceId) } $parameters = [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/campus/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.campus.'), ]; self::$getCampusResource_stmt->execute($parameters); $row = self::$getCampusResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getCampusResource_stmt->closeCursor(); if (!$row['STVCAMP_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource/place/campus/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource.place.campus.').'.'); } return new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } @@ -555,10 +555,10 @@ private function getCampusResources() $resources = []; while ($row = self::$getCampusResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } self::$getCampusResources_stmt->closeCursor(); @@ -641,15 +641,15 @@ public function getResourcesByGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } switch ($resourceGenusType->getIdentifier()) { - case 'genera:resource/person': + case 'genera:resource.person': return $this->getPersonResources(); - case 'genera:resource/place/campus': + case 'genera:resource.place.campus': return $this->getCampusResources(); - case 'genera:resource/place/building': + case 'genera:resource.place.building': return $this->getBuildingResources(); - case 'genera:resource/place/room': + case 'genera:resource.place.room': return $this->getRoomResources(); - // case 'genera:resource/place': + // case 'genera:resource.place': // return $this->getPlaceResources(); default: return new phpkit_EmptyList('osid_resource_ResourceList'); @@ -685,7 +685,7 @@ public function getResourcesByParentGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } - if ('genera:resource/place' == $resourceGenusType->getIdentifier()) { + if ('genera:resource.place' == $resourceGenusType->getIdentifier()) { $resourceList = new phpkit_CombinedList('osid_resource_ResourceList'); $resourceList->addList($this->getCampusResources()); $resourceList->addList($this->getBuildingResources()); diff --git a/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php b/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php index 88de7ce4..48d6de3d 100755 --- a/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php +++ b/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php @@ -45,7 +45,7 @@ class banner_resource_Resource_Lookup_PerCatalogSession extends banner_AbstractS */ public function __construct(banner_ManagerInterface $manager, osid_id_Id $binId) { - parent::__construct($manager, 'resource/'); + parent::__construct($manager, 'resource.'); $this->binId = $binId; } @@ -80,7 +80,7 @@ private function getCatalogParameters() { $params = []; if (null !== $this->binId && !$this->binId->isEqual($this->manager->getCombinedBinId())) { - $params[':catalog_id'] = $this->getDatabaseIdString($this->binId, 'catalog/'); + $params[':catalog_id'] = $this->getDatabaseIdString($this->binId, 'catalog.'); } return $params; @@ -225,11 +225,11 @@ public function getResource(osid_id_Id $resourceId) switch ($type) { case 'person': return $this->getPersonResource($resourceId); - case 'place/room': + case 'place.room': return $this->getRoomResource($resourceId); - case 'place/building': + case 'place.building': return $this->getBuildingResource($resourceId); - case 'place/campus': + case 'place.campus': return $this->getCampusResource($resourceId); default: throw new osid_NotFoundException('No resource found with category '.$type); @@ -245,8 +245,8 @@ public function getResource(osid_id_Id $resourceId) */ public function getResourceType(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -262,8 +262,8 @@ public function getResourceType(osid_id_Id $resourceId) */ public function getResourceValue(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -311,7 +311,7 @@ private function getPersonResource(osid_id_Id $resourceId) $parameters = array_merge( [ - ':webid' => $this->getDatabaseIdString($resourceId, 'resource/person/'), + ':webid' => $this->getDatabaseIdString($resourceId, 'resource.person.'), ], $this->getCatalogParameters()); self::$getPersonResource_stmt->execute($parameters); @@ -319,11 +319,11 @@ private function getPersonResource(osid_id_Id $resourceId) self::$getPersonResource_stmt->closeCursor(); if (!$row['WEB_ID']) { - throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource/person/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource.person.').'.'); } return new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -373,7 +373,7 @@ private function getPersonResources() $resources = []; while ($row = self::$getPersonResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -425,7 +425,7 @@ private function getBuildingResource(osid_id_Id $resourceId) $parameters = array_merge( [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/building/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.building.'), ], $this->getCatalogParameters()); self::$getBuildingResource_stmt->execute($parameters); @@ -433,11 +433,11 @@ private function getBuildingResource(osid_id_Id $resourceId) self::$getBuildingResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource/place/building/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource.place.building.').'.'); } return new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -486,7 +486,7 @@ private function getBuildingResources() $resources = []; while ($row = self::$getBuildingResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -537,8 +537,8 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt = $this->manager->getDB()->prepare($query); } - $roomString = $this->getDatabaseIdString($resourceId, 'resource/place/room/'); - if (!preg_match('#^([a-z0-9_-]+)/(.+)$#i', $roomString, $matches)) { + $roomString = $this->getDatabaseIdString($resourceId, 'resource.place.room.'); + if (!preg_match('#^([a-z0-9_-]+)\.(.+)$#i', $roomString, $matches)) { throw new osid_NotFoundException("Room string '$roomString' doesn't match."); } @@ -553,11 +553,11 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource/place/room/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource.place.room.').'.'); } return new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -610,7 +610,7 @@ private function getRoomResources() $resources = []; while ($row = self::$getRoomResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -649,7 +649,7 @@ private function getCampusResource(osid_id_Id $resourceId) $parameters = array_merge( [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/campus/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.campus.'), ], $this->getCatalogParameters()); self::$getCampusResource_stmt->execute($parameters); @@ -657,14 +657,14 @@ private function getCampusResource(osid_id_Id $resourceId) self::$getCampusResource_stmt->closeCursor(); if (!$row['STVCAMP_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource/place/campus/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource.place.campus.').'.'); } return new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } @@ -697,10 +697,10 @@ private function getCampusResources() $resources = []; while ($row = self::$getCampusResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } self::$getCampusResources_stmt->closeCursor(); @@ -783,15 +783,15 @@ public function getResourcesByGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } switch ($resourceGenusType->getIdentifier()) { - case 'genera:resource/person': + case 'genera:resource.person': return $this->getPersonResources(); - case 'genera:resource/place/campus': + case 'genera:resource.place.campus': return $this->getCampusResources(); - case 'genera:resource/place/building': + case 'genera:resource.place.building': return $this->getBuildingResources(); - case 'genera:resource/place/room': + case 'genera:resource.place.room': return $this->getRoomResources(); - // case 'genera:resource/place': + // case 'genera:resource.place': // return $this->getPlaceResources(); default: return new phpkit_EmptyList('osid_resource_ResourceList'); @@ -827,7 +827,7 @@ public function getResourcesByParentGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } - if ('genera:resource/place' == $resourceGenusType->getIdentifier()) { + if ('genera:resource.place' == $resourceGenusType->getIdentifier()) { $resourceList = new phpkit_CombinedList('osid_resource_ResourceList'); $resourceList->addList($this->getCampusResources()); $resourceList->addList($this->getBuildingResources()); diff --git a/application/library/banner/resource/Resource/Person.php b/application/library/banner/resource/Resource/Person.php index 017b5615..25770527 100755 --- a/application/library/banner/resource/Resource/Person.php +++ b/application/library/banner/resource/Resource/Person.php @@ -77,7 +77,7 @@ public function __construct(osid_id_Id $id, $surname, $givenName, $middleNames = $this->addRecordType($this->namesType); - $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person')); + $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person')); } /** diff --git a/application/library/banner/resource/Resource/Room.php b/application/library/banner/resource/Resource/Room.php index cd372449..0f7c259c 100644 --- a/application/library/banner/resource/Resource/Room.php +++ b/application/library/banner/resource/Resource/Room.php @@ -32,7 +32,7 @@ class banner_resource_Resource_Room extends banner_resource_Resource_Building public function __construct(osid_id_Id $id, $buildingDisplayName, $buildingCode, $room) { parent::__construct($id, $buildingDisplayName, $buildingCode); - $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/room')); + $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.room')); $this->setDisplayName($buildingDisplayName.' '.$room); $this->setDescription($buildingCode.' '.$room); $this->room = $room; diff --git a/application/library/banner/resource/ResourceManager.php b/application/library/banner/resource/ResourceManager.php index 9ea7fa4e..3baf4f53 100755 --- a/application/library/banner/resource/ResourceManager.php +++ b/application/library/banner/resource/ResourceManager.php @@ -78,7 +78,7 @@ public function getIdAuthority() */ public function getCombinedBinId() { - return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'resource/all'); + return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'resource.all'); } /********************************************************* @@ -120,17 +120,17 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $dsn = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_dsn'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_dsn'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $username = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_username'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_username'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $password = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_password'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_password'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode()); @@ -139,7 +139,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $debug = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_count_queries'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_count_queries'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/Boolean')); } catch (osid_ConfigurationErrorException $e) { $debug = false; @@ -158,10 +158,10 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $this->idAuthority = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/id_authority'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.id_authority'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); if (!strlen($this->idAuthority)) { - throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course/id_authority must be specified.'); + throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course.id_authority must be specified.'); } } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode()); diff --git a/application/sql/convert_id_separators_to_period.sql b/application/sql/convert_id_separators_to_period.sql new file mode 100644 index 00000000..e1a66e67 --- /dev/null +++ b/application/sql/convert_id_separators_to_period.sql @@ -0,0 +1,7 @@ +UPDATE user_catalog SET catalog_id_keyword = REPLACE(catalog_id_keyword, '/', '.'); +UPDATE user_savedcourses SET course_id_keyword = REPLACE(course_id_keyword, '/', '.'); +UPDATE user_schedules SET term_id_keyword = REPLACE(term_id_keyword, '/', '.'); +UPDATE user_schedule_offerings SET offering_id_keyword = REPLACE(offering_id_keyword, '/', '.'); +UPDATE archive_configurations SET catalog_id = REPLACE(catalog_id, '/', '.'); +UPDATE archive_configuration_revisions SET json_data=REPLACE(json_data, 'topic\\/subject\\/', 'topic.subject.'); +UPDATE archive_configuration_revisions SET json_data=REPLACE(json_data, 'topic\\/department\\/', 'topic.department.'); diff --git a/application/test/Catalog/Action/Helper/OsidIdTest.php b/application/test/Catalog/Action/Helper/OsidIdTest.php index 6bb7cff0..0a3240f9 100755 --- a/application/test/Catalog/Action/Helper/OsidIdTest.php +++ b/application/test/Catalog/Action/Helper/OsidIdTest.php @@ -32,7 +32,7 @@ protected function tearDown(): void public function testGetOsidIdFromString() { - $id = new phpkit_id_Id('example.edu', 'urn', '123456789/abcd'); + $id = new phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); $idString = $this->osidIdHelper->toString($id); $newId = $this->osidIdHelper->fromString($idString); @@ -42,7 +42,7 @@ public function testGetOsidIdFromString() public function testGetStringFromOsidId() { - $id = new phpkit_id_Id('example.edu', 'urn', '123456789/abcd'); + $id = new phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); $idString = $this->osidIdHelper->toString($id); $this->assertIsString($idString); diff --git a/application/test/Catalog/Action/Helper/OsidTermsTest.php b/application/test/Catalog/Action/Helper/OsidTermsTest.php index ed01aa98..0f6fafea 100755 --- a/application/test/Catalog/Action/Helper/OsidTermsTest.php +++ b/application/test/Catalog/Action/Helper/OsidTermsTest.php @@ -25,10 +25,10 @@ protected function setUp(): void $this->osidHelper->setConfigPath($this->getTestConfigPath()); Zend_Controller_Action_HelperBroker::addHelper($this->osidTermsHelper); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->spring2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200920'); - $this->fall2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200990'); - $this->fall2008TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->spring2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->fall2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200990'); + $this->fall2008TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); $this->termLookup = $this->osidHelper->getCourseManager()->getTermLookupSessionForCatalog($this->mcugId); } diff --git a/application/test/Catalog/Action/Helper/OsidTopicTest.php b/application/test/Catalog/Action/Helper/OsidTopicTest.php index 8b13a9ed..961783c8 100755 --- a/application/test/Catalog/Action/Helper/OsidTopicTest.php +++ b/application/test/Catalog/Action/Helper/OsidTopicTest.php @@ -24,7 +24,7 @@ protected function setUp(): void $this->osidTopicHelper = new Catalog_Action_Helper_Topics(); Zend_Controller_Action_HelperBroker::addHelper($this->osidTopicHelper); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->topicLookup = $this->osidHelper->getCourseManager()->getTopicLookupSessionForCatalog($this->mcugId); } @@ -53,7 +53,7 @@ public function testFilterTopicsByType() $numTopics = $topics->available(); $topicArray = $this->osidTopicHelper->topicListAsArray($topics); - $subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); + $subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); $filteredTopics = $this->osidTopicHelper->filterTopicsByType($topicArray, $subjectType); $this->assertIsArray($filteredTopics); diff --git a/application/test/Catalog/Action/Helper/OsidTypeTest.php b/application/test/Catalog/Action/Helper/OsidTypeTest.php index 5cf3bd0b..a47b7c59 100755 --- a/application/test/Catalog/Action/Helper/OsidTypeTest.php +++ b/application/test/Catalog/Action/Helper/OsidTypeTest.php @@ -34,7 +34,7 @@ protected function tearDown(): void public function testGetOsidTypeFromString() { - $type = new phpkit_type_Type('urn', 'example.edu', '123456789/abcd'); + $type = new phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); $typeString = $this->osidTypeHelper->toString($type); $newType = $this->osidTypeHelper->fromString($typeString); @@ -44,7 +44,7 @@ public function testGetOsidTypeFromString() public function testGetStringFromOsidType() { - $type = new phpkit_type_Type('urn', 'example.edu', '123456789/abcd'); + $type = new phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); $typeString = $this->osidTypeHelper->toString($type); $this->assertIsString($typeString); diff --git a/application/test/Catalog/frontend_config.ini b/application/test/Catalog/frontend_config.ini index 53aff9ab..d2a4456e 100755 --- a/application/test/Catalog/frontend_config.ini +++ b/application/test/Catalog/frontend_config.ini @@ -17,128 +17,128 @@ cache_control.expiration_offset = 3600 # Default course offering types to select in the search UI. -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/LCT" -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/SEM" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.LCT" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.SEM" # The Id authority to shorten for prettier URLs. catalog.shorten_ids_for_authority = "middlebury.edu" # A map of topics to external URLs. This allows linking out to external sites for # departments or programs. -catalog.topic_map.ALAC.id = "topic/department/ALAC" +catalog.topic_map.ALAC.id = "topic.department.ALAC" catalog.topic_map.ALAC.url = "http://go.middlebury.edu/ALAC" -catalog.topic_map.AMCV.id = "topic/department/AMCV" +catalog.topic_map.AMCV.id = "topic.department.AMCV" catalog.topic_map.AMCV.url = "http://go.middlebury.edu/AMCV" -catalog.topic_map.AMLT.id = "topic/department/AMLT" +catalog.topic_map.AMLT.id = "topic.department.AMLT" catalog.topic_map.AMLT.url = "http://go.middlebury.edu/AMLT" -catalog.topic_map.AMST.id = "topic/department/AMST" +catalog.topic_map.AMST.id = "topic.department.AMST" catalog.topic_map.AMST.url = "http://go.middlebury.edu/AMST" -catalog.topic_map.ARBC.id = "topic/department/ARBC" +catalog.topic_map.ARBC.id = "topic.department.ARBC" catalog.topic_map.ARBC.url = "http://go.middlebury.edu/ARBC" -catalog.topic_map.ARDV.id = "topic/department/ARDV" +catalog.topic_map.ARDV.id = "topic.department.ARDV" catalog.topic_map.ARDV.url = "http://go.middlebury.edu/ARDV" -catalog.topic_map.ART.id = "topic/department/ART" +catalog.topic_map.ART.id = "topic.department.ART" catalog.topic_map.ART.url = "http://go.middlebury.edu/ART" -catalog.topic_map.BIOL.id = "topic/department/BIOL" +catalog.topic_map.BIOL.id = "topic.department.BIOL" catalog.topic_map.BIOL.url = "http://go.middlebury.edu/BIOL" -catalog.topic_map.CHEM.id = "topic/department/CHEM" +catalog.topic_map.CHEM.id = "topic.department.CHEM" catalog.topic_map.CHEM.url = "http://go.middlebury.edu/CHEM" -catalog.topic_map.CHNS.id = "topic/department/CHNS" +catalog.topic_map.CHNS.id = "topic.department.CHNS" catalog.topic_map.CHNS.url = "http://go.middlebury.edu/CHNS" -catalog.topic_map.CLAS.id = "topic/department/CLAS" +catalog.topic_map.CLAS.id = "topic.department.CLAS" catalog.topic_map.CLAS.url = "http://go.middlebury.edu/CLAS" -catalog.topic_map.CSCI.id = "topic/department/CSCI" +catalog.topic_map.CSCI.id = "topic.department.CSCI" catalog.topic_map.CSCI.url = "http://go.middlebury.edu/CSCI" -catalog.topic_map.DANC.id = "topic/department/DANC" +catalog.topic_map.DANC.id = "topic.department.DANC" catalog.topic_map.DANC.url = "http://go.middlebury.edu/DANC" -catalog.topic_map.ECON.id = "topic/department/ECON" +catalog.topic_map.ECON.id = "topic.department.ECON" catalog.topic_map.ECON.url = "http://go.middlebury.edu/ECON" -catalog.topic_map.EDST.id = "topic/department/EDST" +catalog.topic_map.EDST.id = "topic.department.EDST" catalog.topic_map.EDST.url = "http://go.middlebury.edu/EDST" -catalog.topic_map.ENAM.id = "topic/department/ENAM" +catalog.topic_map.ENAM.id = "topic.department.ENAM" catalog.topic_map.ENAM.url = "http://go.middlebury.edu/ENAM" -catalog.topic_map.ENGL.id = "topic/department/ENGL" +catalog.topic_map.ENGL.id = "topic.department.ENGL" catalog.topic_map.ENGL.url = "http://go.middlebury.edu/ENGL" -catalog.topic_map.ENVS.id = "topic/department/ENVS" +catalog.topic_map.ENVS.id = "topic.department.ENVS" catalog.topic_map.ENVS.url = "http://go.middlebury.edu/ENVS" -catalog.topic_map.FMMC.id = "topic/department/FMMC" +catalog.topic_map.FMMC.id = "topic.department.FMMC" catalog.topic_map.FMMC.url = "http://go.middlebury.edu/FMMC" -catalog.topic_map.FREN.id = "topic/department/FREN" +catalog.topic_map.FREN.id = "topic.department.FREN" catalog.topic_map.FREN.url = "http://go.middlebury.edu/FREN" -catalog.topic_map.FYSE.id = "topic/department/FYSE" +catalog.topic_map.FYSE.id = "topic.department.FYSE" catalog.topic_map.FYSE.url = "http://go.middlebury.edu/FYSE" -catalog.topic_map.GEOG.id = "topic/department/GEOG" +catalog.topic_map.GEOG.id = "topic.department.GEOG" catalog.topic_map.GEOG.url = "http://go.middlebury.edu/GEOG" -catalog.topic_map.GEOL.id = "topic/department/GEOL" +catalog.topic_map.GEOL.id = "topic.department.GEOL" catalog.topic_map.GEOL.url = "http://go.middlebury.edu/GEOL" -catalog.topic_map.GRMN.id = "topic/department/GRMN" +catalog.topic_map.GRMN.id = "topic.department.GRMN" catalog.topic_map.GRMN.url = "http://go.middlebury.edu/GRMN" -catalog.topic_map.HARC.id = "topic/department/HARC" +catalog.topic_map.HARC.id = "topic.department.HARC" catalog.topic_map.HARC.url = "http://go.middlebury.edu/HARC" -catalog.topic_map.HIST.id = "topic/department/HIST" +catalog.topic_map.HIST.id = "topic.department.HIST" catalog.topic_map.HIST.url = "http://go.middlebury.edu/HIST" -catalog.topic_map.HUDV.id = "topic/department/HUDV" +catalog.topic_map.HUDV.id = "topic.department.HUDV" catalog.topic_map.HUDV.url = "http://go.middlebury.edu/HUDV" -catalog.topic_map.INDE.id = "topic/department/INDE" +catalog.topic_map.INDE.id = "topic.department.INDE" catalog.topic_map.INDE.url = "http://go.middlebury.edu/INDE" -catalog.topic_map.INTD.id = "topic/department/INTD" +catalog.topic_map.INTD.id = "topic.department.INTD" catalog.topic_map.INTD.url = "http://go.middlebury.edu/INTD" -catalog.topic_map.INTL.id = "topic/department/INTL" +catalog.topic_map.INTL.id = "topic.department.INTL" catalog.topic_map.INTL.url = "http://go.middlebury.edu/INTL" -catalog.topic_map.IPEC.id = "topic/department/IPEC" +catalog.topic_map.IPEC.id = "topic.department.IPEC" catalog.topic_map.IPEC.url = "http://go.middlebury.edu/IPEC" -catalog.topic_map.ISEA.id = "topic/department/ISEA" +catalog.topic_map.ISEA.id = "topic.department.ISEA" catalog.topic_map.ISEA.url = "http://go.middlebury.edu/ISEA" -catalog.topic_map.ISRU.id = "topic/department/ISRU" +catalog.topic_map.ISRU.id = "topic.department.ISRU" catalog.topic_map.ISRU.url = "http://go.middlebury.edu/ISRU" -catalog.topic_map.ITAL.id = "topic/department/ITAL" +catalog.topic_map.ITAL.id = "topic.department.ITAL" catalog.topic_map.ITAL.url = "http://go.middlebury.edu/ITAL" -catalog.topic_map.JAPN.id = "topic/department/JAPN" +catalog.topic_map.JAPN.id = "topic.department.JAPN" catalog.topic_map.JAPN.url = "http://go.middlebury.edu/JAPN" -catalog.topic_map.LITP.id = "topic/department/LITP" +catalog.topic_map.LITP.id = "topic.department.LITP" catalog.topic_map.LITP.url = "http://go.middlebury.edu/LITP" -catalog.topic_map.LITS.id = "topic/department/LITS" +catalog.topic_map.LITS.id = "topic.department.LITS" catalog.topic_map.LITS.url = "http://go.middlebury.edu/LITS" -catalog.topic_map.MATH.id = "topic/department/MATH" +catalog.topic_map.MATH.id = "topic.department.MATH" catalog.topic_map.MATH.url = "http://go.middlebury.edu/MATH" -catalog.topic_map.MBBC.id = "topic/department/MBBC" +catalog.topic_map.MBBC.id = "topic.department.MBBC" catalog.topic_map.MBBC.url = "http://go.middlebury.edu/MBBC" -catalog.topic_map.MUSC.id = "topic/department/MUSC" +catalog.topic_map.MUSC.id = "topic.department.MUSC" catalog.topic_map.MUSC.url = "http://go.middlebury.edu/MUSC" -catalog.topic_map.NSCI.id = "topic/department/NSCI" +catalog.topic_map.NSCI.id = "topic.department.NSCI" catalog.topic_map.NSCI.url = "http://go.middlebury.edu/NSCI" -catalog.topic_map.PGSE.id = "topic/department/PGSE" +catalog.topic_map.PGSE.id = "topic.department.PGSE" catalog.topic_map.PGSE.url = "http://go.middlebury.edu/PGSE" -catalog.topic_map.PHED.id = "topic/department/PHED" +catalog.topic_map.PHED.id = "topic.department.PHED" catalog.topic_map.PHED.url = "http://go.middlebury.edu/PHED" -catalog.topic_map.PHIL.id = "topic/department/PHIL" +catalog.topic_map.PHIL.id = "topic.department.PHIL" catalog.topic_map.PHIL.url = "http://go.middlebury.edu/PHIL" -catalog.topic_map.PHYS.id = "topic/department/PHYS" +catalog.topic_map.PHYS.id = "topic.department.PHYS" catalog.topic_map.PHYS.url = "http://go.middlebury.edu/PHYS" -catalog.topic_map.PSCI.id = "topic/department/PSCI" +catalog.topic_map.PSCI.id = "topic.department.PSCI" catalog.topic_map.PSCI.url = "http://go.middlebury.edu/PSCI" -catalog.topic_map.PSYC.id = "topic/department/PSYC" +catalog.topic_map.PSYC.id = "topic.department.PSYC" catalog.topic_map.PSYC.url = "http://go.middlebury.edu/PSYC" -catalog.topic_map.RELI.id = "topic/department/RELI" +catalog.topic_map.RELI.id = "topic.department.RELI" catalog.topic_map.RELI.url = "http://go.middlebury.edu/RELI" -catalog.topic_map.RUSS.id = "topic/department/RUSS" +catalog.topic_map.RUSS.id = "topic.department.RUSS" catalog.topic_map.RUSS.url = "http://go.middlebury.edu/RUSS" -catalog.topic_map.SISP.id = "topic/department/SISP" +catalog.topic_map.SISP.id = "topic.department.SISP" catalog.topic_map.SISP.url = "http://go.middlebury.edu/SISP" -catalog.topic_map.SOAN.id = "topic/department/SOAN" +catalog.topic_map.SOAN.id = "topic.department.SOAN" catalog.topic_map.SOAN.url = "http://go.middlebury.edu/SOAN" -catalog.topic_map.SPAN.id = "topic/department/SPAN" +catalog.topic_map.SPAN.id = "topic.department.SPAN" catalog.topic_map.SPAN.url = "http://go.middlebury.edu/SPAN" -catalog.topic_map.STLD.id = "topic/department/STLD" +catalog.topic_map.STLD.id = "topic.department.STLD" catalog.topic_map.STLD.url = "http://go.middlebury.edu/STLD" -catalog.topic_map.TEDU.id = "topic/department/TEDU" +catalog.topic_map.TEDU.id = "topic.department.TEDU" catalog.topic_map.TEDU.url = "http://go.middlebury.edu/TEDU" -catalog.topic_map.THEA.id = "topic/department/THEA" +catalog.topic_map.THEA.id = "topic.department.THEA" catalog.topic_map.THEA.url = "http://go.middlebury.edu/THEA" -catalog.topic_map.WAGS.id = "topic/department/WAGS" -catalog.topic_map.WAGS.url = "http://go.middlebury.edu/WAGS" -catalog.topic_map.WRPR.id = "topic/department/WRPR" -catalog.topic_map.WRPR.url = "http://go.middlebury.edu/WRPR" +catalog.topic_map.WAGS.id = "topic.department.WAGS" +catalog.topic_map.WAGS.url = "http://go.middlebury.edu.WAGS" +catalog.topic_map.WRPR.id = "topic.department.WRPR" +catalog.topic_map.WRPR.url = "http:..go.middlebury.edu.WRPR" [staging : production] diff --git a/application/test/apc/configuration.plist b/application/test/apc/configuration.plist index 81e4df0b..74d0dcf5 100755 --- a/application/test/apc/configuration.plist +++ b/application/test/apc/configuration.plist @@ -2,18 +2,18 @@ - urn:inet:middlebury.edu:config:banner_course/id_authority + urn:inet:middlebury.edu:config:banner_course.id_authority middlebury.edu - urn:inet:middlebury.edu:config:banner_course/pdo_count_queries + urn:inet:middlebury.edu:config:banner_course.pdo_count_queries - urn:inet:middlebury.edu:config:banner_course/pdo_dsn + urn:inet:middlebury.edu:config:banner_course.pdo_dsn mysql:dbname=afranco_catalog_test;host=localhost - urn:inet:middlebury.edu:config:banner_course/pdo_password + urn:inet:middlebury.edu:config:banner_course.pdo_password testpassword - urn:inet:middlebury.edu:config:banner_course/pdo_username + urn:inet:middlebury.edu:config:banner_course.pdo_username testuser - urn:inet:middlebury.edu:config:apc_course/impl_class_name + urn:inet:middlebury.edu:config:apc_course.impl_class_name banner_course_CourseManager diff --git a/application/test/apc/course/CourseManagerTest.php b/application/test/apc/course/CourseManagerTest.php index 737b2298..f46f0f7e 100755 --- a/application/test/apc/course/CourseManagerTest.php +++ b/application/test/apc/course/CourseManagerTest.php @@ -12,7 +12,7 @@ class apc_course_CourseManagerTest extends banner_course_CourseManagerTest */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->manager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0'); } } diff --git a/application/test/banner/configuration.plist b/application/test/banner/configuration.plist index 1feea851..bc1fe3f1 100755 --- a/application/test/banner/configuration.plist +++ b/application/test/banner/configuration.plist @@ -2,18 +2,18 @@ - urn:inet:middlebury.edu:config:banner_course/id_authority + urn:inet:middlebury.edu:config:banner_course.id_authority middlebury.edu - urn:inet:middlebury.edu:config:banner_course/pdo_count_queries + urn:inet:middlebury.edu:config:banner_course.pdo_count_queries - urn:inet:middlebury.edu:config:banner_course/pdo_dsn + urn:inet:middlebury.edu:config:banner_course.pdo_dsn mysql:dbname=symfony_test;host=database - urn:inet:middlebury.edu:config:banner_course/pdo_password + urn:inet:middlebury.edu:config:banner_course.pdo_password symfony - urn:inet:middlebury.edu:config:banner_course/pdo_username + urn:inet:middlebury.edu:config:banner_course.pdo_username symfony - urn:inet:middlebury.edu:config:apc_course/impl_class_name + urn:inet:middlebury.edu:config:apc_course.impl_class_name banner_course_CourseManager diff --git a/application/test/banner/course/Course/Catalog/SessionTest.php b/application/test/banner/course/Course/Catalog/SessionTest.php index 1f515200..982ecd99 100755 --- a/application/test/banner/course/Course/Catalog/SessionTest.php +++ b/application/test/banner/course/Course/Catalog/SessionTest.php @@ -36,11 +36,11 @@ protected function setUp(): void { $this->session = self::$courseManager->getCourseCatalogSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); } /** diff --git a/application/test/banner/course/Course/Lookup/CombinedSessionTest.php b/application/test/banner/course/Course/Lookup/CombinedSessionTest.php index 7c9df7e3..15ec2786 100755 --- a/application/test/banner/course/Course/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Course/Lookup/CombinedSessionTest.php @@ -34,22 +34,22 @@ protected function getSession() */ protected function setUp(): void { - $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/all'); + $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.all'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseLookupSession(); $this->session->useFederatedCourseCatalogView(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Lookup/SessionTest.php b/application/test/banner/course/Course/Lookup/SessionTest.php index ed765c8d..e0e3f480 100755 --- a/application/test/banner/course/Course/Lookup/SessionTest.php +++ b/application/test/banner/course/Course/Lookup/SessionTest.php @@ -34,19 +34,19 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseLookupSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Search/OrderTest.php b/application/test/banner/course/Course/Search/OrderTest.php index d2196884..9c6a15f5 100755 --- a/application/test/banner/course/Course/Search/OrderTest.php +++ b/application/test/banner/course/Course/Search/OrderTest.php @@ -21,8 +21,8 @@ class banner_course_Course_Search_OrderTest extends TestCase */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); @@ -36,13 +36,13 @@ protected function setUp(): void $this->object = $this->session->getCourseSearchOrder(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Search/QueryTest.php b/application/test/banner/course/Course/Search/QueryTest.php index ba4519c0..a5b7a869 100755 --- a/application/test/banner/course/Course/Search/QueryTest.php +++ b/application/test/banner/course/Course/Search/QueryTest.php @@ -21,8 +21,8 @@ class banner_course_Course_Search_QueryTest extends TestCase */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); @@ -33,19 +33,19 @@ protected function setUp(): void $this->search = $this->session->getCourseSearch(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->levelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->levelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); @@ -58,12 +58,12 @@ protected function setUp(): void $this->topicQueryRecordType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:topic'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); - $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->dudleyId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000004'); - $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000003'); + $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->dudleyId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000004'); + $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000003'); - $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/BL'); + $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.BL'); } /** diff --git a/application/test/banner/course/Course/Search/SearchTest.php b/application/test/banner/course/Course/Search/SearchTest.php index be3999e4..e5d1fbf1 100755 --- a/application/test/banner/course/Course/Search/SearchTest.php +++ b/application/test/banner/course/Course/Search/SearchTest.php @@ -21,8 +21,8 @@ class banner_course_Course_Search_SearchTest extends TestCase */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); @@ -34,14 +34,14 @@ protected function setUp(): void $this->object = $this->session->getCourseSearch(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Search/SessionTest.php b/application/test/banner/course/Course/Search/SessionTest.php index 3fba2251..3703dae2 100755 --- a/application/test/banner/course/Course/Search/SessionTest.php +++ b/application/test/banner/course/Course/Search/SessionTest.php @@ -34,19 +34,19 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php b/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php index f369a4db..94709803 100755 --- a/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php +++ b/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php @@ -36,8 +36,8 @@ protected function setUp(): void { $this->session = self::$courseManager->getCourseCatalogLookupSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseCatalogTest.php b/application/test/banner/course/CourseCatalogTest.php index c141efbe..5f69a35c 100755 --- a/application/test/banner/course/CourseCatalogTest.php +++ b/application/test/banner/course/CourseCatalogTest.php @@ -39,17 +39,17 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseLookupSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseManagerTest.php b/application/test/banner/course/CourseManagerTest.php index 8b9af891..4e80b6ad 100755 --- a/application/test/banner/course/CourseManagerTest.php +++ b/application/test/banner/course/CourseManagerTest.php @@ -31,7 +31,7 @@ protected function getManager() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->manager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'banner_course_CourseManager', '3.0.0'); } diff --git a/application/test/banner/course/CourseOffering/Catalog/SessionTest.php b/application/test/banner/course/CourseOffering/Catalog/SessionTest.php index 474e6509..c26fd4db 100755 --- a/application/test/banner/course/CourseOffering/Catalog/SessionTest.php +++ b/application/test/banner/course/CourseOffering/Catalog/SessionTest.php @@ -36,11 +36,11 @@ protected function setUp(): void { $this->session = self::$courseManager->getCourseOfferingCatalogSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->sectionId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/92418'); + $this->sectionId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.92418'); } /** diff --git a/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php b/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php index 660b80a8..79c2746e 100755 --- a/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php @@ -31,30 +31,30 @@ protected function getSession() */ protected function setUp(): void { - $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/all'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.all'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseOfferingLookupSession(); $this->session->useFederatedCourseCatalogView(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); @@ -62,9 +62,9 @@ protected function setUp(): void $this->secondaryType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:secondary'); $this->undergraduateType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:undergraduate'); - $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'); - $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LAB'); - $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/DSC'); + $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'); + $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LAB'); + $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.DSC'); } /** diff --git a/application/test/banner/course/CourseOffering/Lookup/SessionTest.php b/application/test/banner/course/CourseOffering/Lookup/SessionTest.php index 2fe8df09..d2b3d8e9 100755 --- a/application/test/banner/course/CourseOffering/Lookup/SessionTest.php +++ b/application/test/banner/course/CourseOffering/Lookup/SessionTest.php @@ -31,29 +31,29 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseOfferingLookupSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); - $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); + $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); @@ -61,9 +61,9 @@ protected function setUp(): void $this->secondaryType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:secondary'); $this->undergraduateType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:undergraduate'); - $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'); - $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LAB'); - $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/DSC'); + $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'); + $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LAB'); + $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.DSC'); } /** diff --git a/application/test/banner/course/CourseOffering/Search/OrderTest.php b/application/test/banner/course/CourseOffering/Search/OrderTest.php index 2eec3d7b..812afaec 100755 --- a/application/test/banner/course/CourseOffering/Search/OrderTest.php +++ b/application/test/banner/course/CourseOffering/Search/OrderTest.php @@ -23,21 +23,21 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseOfferingSearchOrder(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200420'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200420'); $this->query = $this->session->getCourseOfferingQuery(); $this->query->matchTermId($this->termId, true); $this->search = $this->session->getCourseOfferingSearch(); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); diff --git a/application/test/banner/course/CourseOffering/Search/QueryTest.php b/application/test/banner/course/CourseOffering/Search/QueryTest.php index 04aba49c..cf72c017 100755 --- a/application/test/banner/course/CourseOffering/Search/QueryTest.php +++ b/application/test/banner/course/CourseOffering/Search/QueryTest.php @@ -23,44 +23,44 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseOfferingQuery(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); - $this->termId2 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200790'); - - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->geolSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/GEOL'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); - $this->natsciDivTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); - $this->ccBlockTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/block/CC'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + $this->termId2 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200790'); + + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->geolSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.GEOL'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); + $this->natsciDivTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); + $this->ccBlockTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.block.CC'); $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->weeklyScheduleType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); $this->enrollmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); - $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'); - $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LAB'); - $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/DSC'); + $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'); + $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LAB'); + $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.DSC'); - $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000003'); + $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000003'); - $this->mbh216Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/216'); - $this->mbh560Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/560'); - $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/BL'); + $this->mbh216Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.216'); + $this->mbh560Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.560'); + $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.BL'); } /** diff --git a/application/test/banner/course/CourseOffering/Search/SearchTest.php b/application/test/banner/course/CourseOffering/Search/SearchTest.php index 5f1db8f5..d51078a5 100755 --- a/application/test/banner/course/CourseOffering/Search/SearchTest.php +++ b/application/test/banner/course/CourseOffering/Search/SearchTest.php @@ -23,18 +23,18 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseOfferingSearch(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200420'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200420'); $this->query = $this->session->getCourseOfferingQuery(); $this->query->matchTermId($this->termId, true); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); diff --git a/application/test/banner/course/CourseOffering/Search/SessionTest.php b/application/test/banner/course/CourseOffering/Search/SessionTest.php index 9d8f54f3..5644da2c 100755 --- a/application/test/banner/course/CourseOffering/Search/SessionTest.php +++ b/application/test/banner/course/CourseOffering/Search/SessionTest.php @@ -31,28 +31,28 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseOfferingTest.php b/application/test/banner/course/CourseOfferingTest.php index 066f1fb6..74b75d8b 100755 --- a/application/test/banner/course/CourseOfferingTest.php +++ b/application/test/banner/course/CourseOfferingTest.php @@ -31,12 +31,12 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/92418'); - $this->geogOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/92443'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200520/20022'); + $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.92418'); + $this->geogOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.92443'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200520.20022'); $this->session = self::$courseManager->getCourseOfferingLookupSessionForCatalog($this->mcugCatalogId); $this->object = $this->session->getCourseOffering($this->physOfferingId); @@ -64,7 +64,7 @@ public function testGenusType() { $type = $this->object->getGenusType(); $this->assertInstanceOf('osid_type_Type', $type); - $this->assertEquals('genera:offering/LCT', $type->getIdentifier()); + $this->assertEquals('genera:offering.LCT', $type->getIdentifier()); $this->assertEquals('Lecture', trim($type->getDisplayName())); } @@ -81,13 +81,13 @@ public function testGetTitle() */ public function testEffectiveDateTitle() { - $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200390/90085'); - $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); - $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200490/90066'); - $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200520/20019'); - $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200590/90056'); - $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200620/20017'); - $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90040'); + $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200390.90085'); + $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); + $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200490.90066'); + $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200520.20019'); + $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200590.90056'); + $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200620.20017'); + $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90040'); $this->assertEquals('Fundamentals of Chemistry II', $this->session->getCourseOffering($chem200390)->getTitle()); $this->assertEquals('Fundamentals of Chemistry II', $this->session->getCourseOffering($chem200420)->getTitle()); @@ -109,13 +109,13 @@ public function testGetPhysDescription() */ public function testEffectiveDateDescription() { - $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200390/90085'); - $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); - $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200490/90066'); - $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200520/20019'); - $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200590/90056'); - $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200620/20017'); - $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90040'); + $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200390.90085'); + $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); + $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200490.90066'); + $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200520.20019'); + $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200590.90056'); + $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200620.20017'); + $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90040'); $description = 'Major topics include chemical kinetics, chemical equilibrium, acid-base equilibria, chemical thermodynamics, electrochemistry, descriptive inorganic chemistry, and coordination chemistry. Lab work includes inorganic synthesis, qualitative analysis, and quantitative analysis in kinetics, acid-base and redox chemistry. (CHEM 0103 or by waiver) 3 hrs. lect., 3 hrs. lab, 1 hr. disc.'; @@ -192,12 +192,12 @@ public function testTopicIds() { $list = $this->object->getTopicIds(); $identifiers = [ - 'topic/subject/PHYS', - 'topic/department/PHYS', - 'topic/division/NSCI', - 'topic/requirement/DED', - 'topic/requirement/SCI', - 'topic/level/UG', + 'topic.subject.PHYS', + 'topic.department.PHYS', + 'topic.division.NSCI', + 'topic.requirement.DED', + 'topic.requirement.SCI', + 'topic.level.UG', ]; $found = []; $this->assertTrue($list->hasNext()); @@ -226,13 +226,13 @@ public function testGeolTopicIds() $list = $offering->getTopicIds(); $this->assertEquals(7, $list->available()); $identifiers = [ - 'topic/subject/GEOL', - 'topic/department/GEOL', - 'topic/division/NSCI', - 'topic/requirement/DED', - 'topic/requirement/SCI', - 'topic/level/UG', - 'topic/block/CC', + 'topic.subject.GEOL', + 'topic.department.GEOL', + 'topic.division.NSCI', + 'topic.requirement.DED', + 'topic.requirement.SCI', + 'topic.level.UG', + 'topic.block.CC', ]; $found = []; while ($list->hasNext()) { diff --git a/application/test/banner/course/CourseTest.php b/application/test/banner/course/CourseTest.php index 6d8851cb..a12a73bd 100755 --- a/application/test/banner/course/CourseTest.php +++ b/application/test/banner/course/CourseTest.php @@ -31,11 +31,11 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->geogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOG0250'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->geogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOG0250'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); $this->session = self::$courseManager->getCourseLookupSessionForCatalog($this->mcugId); $this->object = $this->session->getCourse($this->physId); @@ -120,10 +120,10 @@ public function testTopicIds() { $list = $this->object->getTopicIds(); $identifiers = [ - 'topic/subject/PHYS', - 'topic/department/PHYS', - 'topic/division/NSCI', - 'topic/level/UG', + 'topic.subject.PHYS', + 'topic.department.PHYS', + 'topic.division.NSCI', + 'topic.level.UG', ]; $found = []; $this->assertTrue($list->hasNext()); diff --git a/application/test/banner/course/PartOfTermCourseOfferingTest.php b/application/test/banner/course/PartOfTermCourseOfferingTest.php index 70328a61..19f284c2 100644 --- a/application/test/banner/course/PartOfTermCourseOfferingTest.php +++ b/application/test/banner/course/PartOfTermCourseOfferingTest.php @@ -31,13 +31,13 @@ protected function getObject() */ protected function setUp(): void { - $this->mclsCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCLS'); - $this->hebmCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/HEBM5642'); - $this->hebmOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/201690/92587'); - $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200390/90260'); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); + $this->mclsCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCLS'); + $this->hebmCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.HEBM5642'); + $this->hebmOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.201690.92587'); + $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200390.90260'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); $this->session = self::$courseManager->getCourseOfferingLookupSessionForCatalog($this->mclsCatalogId); $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mclsCatalogId); @@ -61,14 +61,14 @@ protected function tearDown(): void public function testGetTermId() { $this->assertInstanceOf('osid_id_Id', $this->object->getTermId()); - $this->assertEquals('term/201690/HBM', $this->object->getTermId()->getIdentifier()); + $this->assertEquals('term.201690.HBM', $this->object->getTermId()->getIdentifier()); } public function testGetTerm() { $term = $this->object->getTerm(); $this->assertInstanceOf('osid_course_Term', $term); - $this->assertEquals('term/201690/HBM', $term->getId()->getIdentifier()); + $this->assertEquals('term.201690.HBM', $term->getId()->getIdentifier()); } public function testTermStartDate() @@ -88,7 +88,7 @@ public function testTermEndDate() */ public function testOfferingFoundInBaseTerm() { - $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690'), $this->hebmCourseId); + $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690'), $this->hebmCourseId); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); $this->assertTrue($this->hebmOfferingId->isEqual($offering->getId())); @@ -99,7 +99,7 @@ public function testOfferingFoundInBaseTerm() */ public function testOfferingFoundInPartOfTerm() { - $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690/HBM'), $this->hebmCourseId); + $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690.HBM'), $this->hebmCourseId); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); $this->assertTrue($this->hebmOfferingId->isEqual($offering->getId())); @@ -111,7 +111,7 @@ public function testOfferingFoundInPartOfTerm() public function testOfferingSearchBaseTerm() { $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690'), true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); @@ -124,7 +124,7 @@ public function testOfferingSearchBaseTerm() public function testOfferingSearchPartOfTerm() { $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690/HBM'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690.HBM'), true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); @@ -139,7 +139,7 @@ public function testOfferingSearchBaseTermUg() $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugCatalogId); $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200390'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200390'), true); $query->matchCourseId($this->physId, true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); @@ -154,7 +154,7 @@ public function testOfferingSearchPartOfTermUg1() { $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugCatalogId); $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200390/1'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200390.1'), true); $query->matchCourseId($this->physId, true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); @@ -169,7 +169,7 @@ public function testOfferingSearchPartOfTermUgHbm() { $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugCatalogId); $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200390/HBM'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200390.HBM'), true); $query->matchCourseId($this->physId, true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertFalse($offerings->hasNext()); diff --git a/application/test/banner/course/Term/Catalog/SessionTest.php b/application/test/banner/course/Term/Catalog/SessionTest.php index b168e9b6..de2143df 100755 --- a/application/test/banner/course/Term/Catalog/SessionTest.php +++ b/application/test/banner/course/Term/Catalog/SessionTest.php @@ -38,11 +38,11 @@ protected function setUp(): void { $this->session = self::$courseManager->getTermCatalogSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); } /** diff --git a/application/test/banner/course/Term/Lookup/CombinedSessionTest.php b/application/test/banner/course/Term/Lookup/CombinedSessionTest.php index e4b01d44..670ec779 100755 --- a/application/test/banner/course/Term/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Term/Lookup/CombinedSessionTest.php @@ -31,11 +31,11 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); - $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200920'); - $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200866'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200866'); $this->session = self::$courseManager->getTermLookupSession(); $this->session->useComparativeView(); diff --git a/application/test/banner/course/Term/Lookup/SessionTest.php b/application/test/banner/course/Term/Lookup/SessionTest.php index 18061b9b..29ea475f 100755 --- a/application/test/banner/course/Term/Lookup/SessionTest.php +++ b/application/test/banner/course/Term/Lookup/SessionTest.php @@ -31,11 +31,11 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); - $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200920'); - $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200866'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200866'); $this->session = self::$courseManager->getTermLookupSessionForCatalog($this->mcugId); diff --git a/application/test/banner/course/TermTest.php b/application/test/banner/course/TermTest.php index cf947632..9538fade 100755 --- a/application/test/banner/course/TermTest.php +++ b/application/test/banner/course/TermTest.php @@ -31,9 +31,9 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); $this->session = self::$courseManager->getTermLookupSessionForCatalog($this->mcugId); $this->object = $this->session->getTerm($this->termId); diff --git a/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php b/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php index 1ee6c798..fd1a7993 100755 --- a/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php @@ -33,45 +33,45 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getTopicLookupSession(); $this->session->useComparativeView(); $this->session->useFederatedCourseCatalogView(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/GEOL'); - $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); + $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.GEOL'); + $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); - $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/GEOL'); - $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); + $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.GEOL'); + $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); - $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); - $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/block/CC'); + $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.block.CC'); - $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/ARTS'); + $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.ARTS'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200893/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200893.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200893'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200893'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Topic/Lookup/SessionTest.php b/application/test/banner/course/Topic/Lookup/SessionTest.php index 922aefdf..f120d5b6 100755 --- a/application/test/banner/course/Topic/Lookup/SessionTest.php +++ b/application/test/banner/course/Topic/Lookup/SessionTest.php @@ -33,46 +33,46 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getTopicLookupSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/GEOL'); - $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); + $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.GEOL'); + $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); - $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/GEOL'); - $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); + $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.GEOL'); + $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); - $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); - $this->ugLevelId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); + $this->ugLevelId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); - $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/block/CC'); + $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.block.CC'); - $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/ARTS'); + $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.ARTS'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200893/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200893.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200893'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200893'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Topic/Search/OrderTest.php b/application/test/banner/course/Topic/Search/OrderTest.php index 7492f920..c499a11e 100755 --- a/application/test/banner/course/Topic/Search/OrderTest.php +++ b/application/test/banner/course/Topic/Search/OrderTest.php @@ -23,20 +23,20 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getTopicSearchOrder(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); } /** diff --git a/application/test/banner/course/Topic/Search/QueryTest.php b/application/test/banner/course/Topic/Search/QueryTest.php index 6203ce5e..4208a6c4 100755 --- a/application/test/banner/course/Topic/Search/QueryTest.php +++ b/application/test/banner/course/Topic/Search/QueryTest.php @@ -23,22 +23,22 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getTopicQuery(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); } /** diff --git a/application/test/banner/course/Topic/Search/SearchTest.php b/application/test/banner/course/Topic/Search/SearchTest.php index 7428639f..5bbffdcf 100755 --- a/application/test/banner/course/Topic/Search/SearchTest.php +++ b/application/test/banner/course/Topic/Search/SearchTest.php @@ -23,20 +23,20 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getTopicSearch(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); } /** @@ -68,8 +68,8 @@ public function testSearchWithinTopicResults() public function testSearchAmongTopics() { $topicList = new phpkit_id_ArrayIdList([ - new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'), ]); $this->object->searchAmongTopics($topicList); diff --git a/application/test/banner/course/Topic/Search/SessionTest.php b/application/test/banner/course/Topic/Search/SessionTest.php index 1cfe2518..4a17f2fe 100755 --- a/application/test/banner/course/Topic/Search/SessionTest.php +++ b/application/test/banner/course/Topic/Search/SessionTest.php @@ -23,19 +23,19 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); } /** diff --git a/application/test/banner/resource/Bin/Lookup/SessionTest.php b/application/test/banner/resource/Bin/Lookup/SessionTest.php index c548617b..97e3e4ad 100755 --- a/application/test/banner/resource/Bin/Lookup/SessionTest.php +++ b/application/test/banner/resource/Bin/Lookup/SessionTest.php @@ -37,8 +37,8 @@ protected function setUp(): void $this->manager = self::$courseManager->getResourceManager(); $this->session = $this->manager->getBinLookupSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php b/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php index 5a8d3f25..8b51fb73 100755 --- a/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php +++ b/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php @@ -31,24 +31,24 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); - $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/all'); + $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.all'); $this->manager = self::$courseManager->getResourceManager(); $this->session = $this->manager->getResourceLookupSessionForBin($this->mcugId); - $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person'); - $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/room'); - $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/building'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus'); - $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place'); + $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person'); + $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.room'); + $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.building'); + $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); + $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place'); - $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000007'); - $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/building/MBH'); - $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/538'); + $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000007'); + $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.building.MBH'); + $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.538'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); @@ -146,7 +146,7 @@ public function testGetResourcesByPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } @@ -194,7 +194,7 @@ public function testGetResourcesByParentPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } diff --git a/application/test/banner/resource/Resource/Lookup/SessionTest.php b/application/test/banner/resource/Resource/Lookup/SessionTest.php index 8e28ae93..2c997561 100755 --- a/application/test/banner/resource/Resource/Lookup/SessionTest.php +++ b/application/test/banner/resource/Resource/Lookup/SessionTest.php @@ -31,21 +31,21 @@ protected function getSession() */ protected function setUp(): void { - $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/all'); + $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.all'); $this->manager = self::$courseManager->getResourceManager(); $this->session = $this->manager->getResourceLookupSession(); - $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person'); - $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/room'); - $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/building'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus'); - $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place'); + $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person'); + $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.room'); + $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.building'); + $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); + $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place'); - $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000007'); - $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/building/MBH'); - $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/538'); + $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000007'); + $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.building.MBH'); + $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.538'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); @@ -143,7 +143,7 @@ public function testGetResourcesByPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } @@ -191,7 +191,7 @@ public function testGetResourcesByParentPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } diff --git a/application/test/banner/resource/Resource/PersonTest.php b/application/test/banner/resource/Resource/PersonTest.php index 6de1b632..edd35b18 100755 --- a/application/test/banner/resource/Resource/PersonTest.php +++ b/application/test/banner/resource/Resource/PersonTest.php @@ -36,10 +36,10 @@ protected function setUp(): void { $this->namesType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:unknown'); - $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person'); + $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person'); $this->object = new banner_resource_Resource_Person( - new phpkit_id_Id('urn', 'middlebury.edu', 'person/12345'), + new phpkit_id_Id('urn', 'middlebury.edu', 'person.12345'), "O'Brien", 'Thaddeus', 'Peter Michael', @@ -50,7 +50,7 @@ protected function setUp(): void $this->names = $this->object->getResourceRecord($this->namesType); $this->object2 = new banner_resource_Resource_Person( - new phpkit_id_Id('urn', 'middlebury.edu', 'person/54321'), + new phpkit_id_Id('urn', 'middlebury.edu', 'person.54321'), 'Jones', 'Howard' ); @@ -147,7 +147,7 @@ public function testGetGenusType() $this->assertInstanceOf('osid_type_Type', $type); $this->assertEquals('urn', $type->getIdentifierNamespace()); $this->assertEquals('middlebury.edu', $type->getAuthority()); - $this->assertEquals('genera:resource/person', $type->getIdentifier()); + $this->assertEquals('genera:resource.person', $type->getIdentifier()); $this->assertTrue($type->isEqual($this->personType)); } } diff --git a/application/test/banner/resource/ResourceManagerTest.php b/application/test/banner/resource/ResourceManagerTest.php index cc255905..8e1ac4f4 100755 --- a/application/test/banner/resource/ResourceManagerTest.php +++ b/application/test/banner/resource/ResourceManagerTest.php @@ -31,7 +31,7 @@ protected function getManager() */ protected function setUp(): void { - $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/all'); + $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.all'); $this->manager = self::$courseManager->getResourceManager(); } diff --git a/application/views/scripts/offerings/search.phtml b/application/views/scripts/offerings/search.phtml index 97ab35f6..bb6153ff 100755 --- a/application/views/scripts/offerings/search.phtml +++ b/application/views/scripts/offerings/search.phtml @@ -443,7 +443,7 @@ print "\n\t
"; print "\n\t\t
Type:
"; print "\n\t\t
".$this->escape($section->getGenusType()->getDisplayName())."
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/instruction_method")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.instruction_method")); if (!empty($topics)) { print "\n\t\t
Course Modality:
"; print "\n\t\t
"; @@ -464,7 +464,7 @@ print "\n\t\t
Term:
"; +print "\n\t\t"; print "\n\t\t
Department:
"; print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/department")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department")); foreach ($topics as $topic) { $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); print "url($topicParams)."\">"; @@ -475,7 +475,7 @@ print "
"; print "\n\t\t
Requirements Fulfilled:
"; print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/requirement")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement")); foreach ($topics as $topic) { $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); print "url($topicParams)."\">"; @@ -486,7 +486,7 @@ print "
"; print "\n\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/block")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block")); if (!empty($topics)) { print "\n\t\t
Additional Details:
"; print "\n\t\t
"; @@ -566,7 +566,7 @@ if (!empty($availabilityLink)) { // print "\n\t
Subject:
"; // print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/subject")); +// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject")); // foreach ($topics as $topic) { // $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); // print "url($topicParams)."\">"; @@ -577,7 +577,7 @@ if (!empty($availabilityLink)) { // print "\n\t\t
Division:
"; // print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/division")); +// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.division")); // foreach ($topics as $topic) { // $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); // print "url($topicParams)."\">"; diff --git a/application/views/scripts/offerings/searchxml.phtml b/application/views/scripts/offerings/searchxml.phtml index 14792cce..498a77c2 100755 --- a/application/views/scripts/offerings/searchxml.phtml +++ b/application/views/scripts/offerings/searchxml.phtml @@ -109,7 +109,7 @@ print " "; printTerm($this, $term); -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/subject"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -119,7 +119,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/department"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -129,7 +129,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/requirement"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -139,7 +139,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/level"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.level"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -149,7 +149,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/block"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) {