Upgrade to 2018

Author: osimloeff

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .Ruserdata
+.vs/

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: piwebapi
 Type: Package
 Title: PI Web API client R package
-Version: 1.1.1
+Version: 1.11.0
 Author: Marcos Vainer Loeff
 Maintainer: OSIsoft PI Developers Club <[email protected]>
 Description: This is an R package generated using the PI Web API JSON Swagger specification.

R/PIAmbiguous.r

@@ -0,0 +1,12 @@
+PIAmbiguous <- function(reason = NULL) {
+	if (is.null(reason) == FALSE) {
+		if (is.character(reason) == FALSE) {
+			return (print(paste0("Error: reason must be a string.")))
+		}
+	}
+	value <- list(
+	Reason = reason)
+	valueCleaned <- rmNullObs(value)
+	attr(valueCleaned, "className") <- "PIAmbiguous"
+	return(valueCleaned)
+}

R/PIAnnotationLinks.r

@@ -1,4 +1,4 @@
-PIAnnotationLinks <- function(self = NULL, owner = NULL) {
+PIAnnotationLinks <- function(self = NULL, owner = NULL, mediaData = NULL, mediaMetadata = NULL) {
 	if (is.null(self) == FALSE) {
 		if (is.character(self) == FALSE) {
 			return (print(paste0("Error: self must be a string.")))
@@ -9,9 +9,21 @@ PIAnnotationLinks <- function(self = NULL, owner = NULL) {
 			return (print(paste0("Error: owner must be a string.")))
 		}
 	}
+	if (is.null(mediaData) == FALSE) {
+		if (is.character(mediaData) == FALSE) {
+			return (print(paste0("Error: mediaData must be a string.")))
+		}
+	}
+	if (is.null(mediaMetadata) == FALSE) {
+		if (is.character(mediaMetadata) == FALSE) {
+			return (print(paste0("Error: mediaMetadata must be a string.")))
+		}
+	}
 	value <- list(
 	Self = self,
-	Owner = owner)
+	Owner = owner,
+	MediaData = mediaData,
+	MediaMetadata = mediaMetadata)
 	valueCleaned <- rmNullObs(value)
 	attr(valueCleaned, "className") <- "PIAnnotationLinks"
 	return(valueCleaned)

R/PIAssetServer.r

@@ -1,4 +1,4 @@
-PIAssetServer <- function(webId = NULL, id = NULL, name = NULL, description = NULL, path = NULL, isConnected = NULL, serverVersion = NULL, extendedProperties = NULL, links = NULL, webException = NULL) {
+PIAssetServer <- function(webId = NULL, id = NULL, name = NULL, description = NULL, path = NULL, isConnected = NULL, serverVersion = NULL, serverTime = NULL, extendedProperties = NULL, links = NULL, webException = NULL) {
 	if (is.null(webId) == FALSE) {
 		if (is.character(webId) == FALSE) {
 			return (print(paste0("Error: webId must be a string.")))
@@ -34,6 +34,11 @@ PIAssetServer <- function(webId = NULL, id = NULL, name = NULL, description = NU
 			return (print(paste0("Error: serverVersion must be a string.")))
 		}
 	}
+	if (is.null(serverTime) == FALSE) {
+		if (is.character(serverTime) == FALSE) {
+			return (print(paste0("Error: serverTime must be a string.")))
+		}
+	}
 	if (is.null(extendedProperties) == FALSE) {
 	}
 	if (is.null(links) == FALSE) {
@@ -56,6 +61,7 @@ PIAssetServer <- function(webId = NULL, id = NULL, name = NULL, description = NU
 	Path = path,
 	IsConnected = isConnected,
 	ServerVersion = serverVersion,
+	ServerTime = serverTime,
 	ExtendedProperties = extendedProperties,
 	Links = links,
 	WebException = webException)

R/PIAssetServerLinks.r

@@ -1,4 +1,4 @@
-PIAssetServerLinks <- function(self = NULL, databases = NULL, securityIdentities = NULL, securityMappings = NULL, unitClasses = NULL, analysisRulePlugIns = NULL, timeRulePlugIns = NULL, security = NULL, securityEntries = NULL) {
+PIAssetServerLinks <- function(self = NULL, databases = NULL, notificationContactTemplates = NULL, securityIdentities = NULL, securityMappings = NULL, unitClasses = NULL, analysisRulePlugIns = NULL, timeRulePlugIns = NULL, security = NULL, securityEntries = NULL) {
 	if (is.null(self) == FALSE) {
 		if (is.character(self) == FALSE) {
 			return (print(paste0("Error: self must be a string.")))
@@ -9,6 +9,11 @@ PIAssetServerLinks <- function(self = NULL, databases = NULL, securityIdentities
 			return (print(paste0("Error: databases must be a string.")))
 		}
 	}
+	if (is.null(notificationContactTemplates) == FALSE) {
+		if (is.character(notificationContactTemplates) == FALSE) {
+			return (print(paste0("Error: notificationContactTemplates must be a string.")))
+		}
+	}
 	if (is.null(securityIdentities) == FALSE) {
 		if (is.character(securityIdentities) == FALSE) {
 			return (print(paste0("Error: securityIdentities must be a string.")))
@@ -47,6 +52,7 @@ PIAssetServerLinks <- function(self = NULL, databases = NULL, securityIdentities
 	value <- list(
 	Self = self,
 	Databases = databases,
+	NotificationContactTemplates = notificationContactTemplates,
 	SecurityIdentities = securityIdentities,
 	SecurityMappings = securityMappings,
 	UnitClasses = unitClasses,

R/PIAttribute.r

@@ -1,4 +1,4 @@
-PIAttribute <- function(webId = NULL, id = NULL, name = NULL, description = NULL, path = NULL, type = NULL, typeQualifier = NULL, defaultUnitsName = NULL, dataReferencePlugIn = NULL, configString = NULL, isConfigurationItem = NULL, isExcluded = NULL, isHidden = NULL, isManualDataEntry = NULL, hasChildren = NULL, categoryNames = NULL, step = NULL, traitName = NULL, links = NULL, webException = NULL) {
+PIAttribute <- function(webId = NULL, id = NULL, name = NULL, description = NULL, path = NULL, type = NULL, typeQualifier = NULL, defaultUnitsName = NULL, displayDigits = NULL, dataReferencePlugIn = NULL, configString = NULL, isConfigurationItem = NULL, isExcluded = NULL, isHidden = NULL, isManualDataEntry = NULL, hasChildren = NULL, categoryNames = NULL, step = NULL, traitName = NULL, defaultUnitsNameAbbreviation = NULL, span = NULL, zero = NULL, links = NULL, webException = NULL) {
 	if (is.null(webId) == FALSE) {
 		if (is.character(webId) == FALSE) {
 			return (print(paste0("Error: webId must be a string.")))
@@ -39,6 +39,11 @@ PIAttribute <- function(webId = NULL, id = NULL, name = NULL, description = NULL
 			return (print(paste0("Error: defaultUnitsName must be a string.")))
 		}
 	}
+	if (is.null(displayDigits) == FALSE) {
+		if (check.integer(displayDigits) == FALSE) {
+			return (print(paste0("Error: displayDigits must be an integer.")))
+		}
+	}
 	if (is.null(dataReferencePlugIn) == FALSE) {
 		if (is.character(dataReferencePlugIn) == FALSE) {
 			return (print(paste0("Error: dataReferencePlugIn must be a string.")))
@@ -92,6 +97,15 @@ PIAttribute <- function(webId = NULL, id = NULL, name = NULL, description = NULL
 			return (print(paste0("Error: traitName must be a string.")))
 		}
 	}
+	if (is.null(defaultUnitsNameAbbreviation) == FALSE) {
+		if (is.character(defaultUnitsNameAbbreviation) == FALSE) {
+			return (print(paste0("Error: defaultUnitsNameAbbreviation must be a string.")))
+		}
+	}
+	if (is.null(span) == FALSE) {
+	}
+	if (is.null(zero) == FALSE) {
+	}
 	if (is.null(links) == FALSE) {
 		className <- attr(links, "className")
 		if ((is.null(className)) || (className != "PIAttributeLinks")) {
@@ -113,6 +127,7 @@ PIAttribute <- function(webId = NULL, id = NULL, name = NULL, description = NULL
 	Type = type,
 	TypeQualifier = typeQualifier,
 	DefaultUnitsName = defaultUnitsName,
+	DisplayDigits = displayDigits,
 	DataReferencePlugIn = dataReferencePlugIn,
 	ConfigString = configString,
 	IsConfigurationItem = isConfigurationItem,
@@ -123,6 +138,9 @@ PIAttribute <- function(webId = NULL, id = NULL, name = NULL, description = NULL
 	CategoryNames = categoryNames,
 	Step = step,
 	TraitName = traitName,
+	DefaultUnitsNameAbbreviation = defaultUnitsNameAbbreviation,
+	Span = span,
+	Zero = zero,
 	Links = links,
 	WebException = webException)
 	valueCleaned <- rmNullObs(value)

R/PIAttributeTemplate.r

@@ -1,4 +1,4 @@
-PIAttributeTemplate <- function(webId = NULL, id = NULL, name = NULL, description = NULL, path = NULL, type = NULL, typeQualifier = NULL, defaultUnitsName = NULL, defaultValue = NULL, dataReferencePlugIn = NULL, configString = NULL, isConfigurationItem = NULL, isExcluded = NULL, isHidden = NULL, isManualDataEntry = NULL, hasChildren = NULL, categoryNames = NULL, traitName = NULL, links = NULL, webException = NULL) {
+PIAttributeTemplate <- function(webId = NULL, id = NULL, name = NULL, description = NULL, path = NULL, type = NULL, typeQualifier = NULL, defaultUnitsName = NULL, defaultValue = NULL, dataReferencePlugIn = NULL, configString = NULL, isConfigurationItem = NULL, isExcluded = NULL, isHidden = NULL, isManualDataEntry = NULL, hasChildren = NULL, categoryNames = NULL, traitName = NULL, defaultUnitsNameAbbreviation = NULL, links = NULL, webException = NULL) {
 	if (is.null(webId) == FALSE) {
 		if (is.character(webId) == FALSE) {
 			return (print(paste0("Error: webId must be a string.")))
@@ -89,6 +89,11 @@ PIAttributeTemplate <- function(webId = NULL, id = NULL, name = NULL, descriptio
 			return (print(paste0("Error: traitName must be a string.")))
 		}
 	}
+	if (is.null(defaultUnitsNameAbbreviation) == FALSE) {
+		if (is.character(defaultUnitsNameAbbreviation) == FALSE) {
+			return (print(paste0("Error: defaultUnitsNameAbbreviation must be a string.")))
+		}
+	}
 	if (is.null(links) == FALSE) {
 		className <- attr(links, "className")
 		if ((is.null(className)) || (className != "PIAttributeTemplateLinks")) {
@@ -120,6 +125,7 @@ PIAttributeTemplate <- function(webId = NULL, id = NULL, name = NULL, descriptio
 	HasChildren = hasChildren,
 	CategoryNames = categoryNames,
 	TraitName = traitName,
+	DefaultUnitsNameAbbreviation = defaultUnitsNameAbbreviation,
 	Links = links,
 	WebException = webException)
 	valueCleaned <- rmNullObs(value)

R/PIDataPipeEvent.r

@@ -0,0 +1,64 @@
+PIDataPipeEvent <- function(action = NULL, timestamp = NULL, unitsAbbreviation = NULL, good = NULL, questionable = NULL, substituted = NULL, annotated = NULL, value = NULL, errors = NULL, webException = NULL) {
+	if (is.null(action) == FALSE) {
+		if (is.character(action) == FALSE) {
+			return (print(paste0("Error: action must be a string.")))
+		}
+	}
+	if (is.null(timestamp) == FALSE) {
+		if (is.character(timestamp) == FALSE) {
+			return (print(paste0("Error: timestamp must be a string.")))
+		}
+	}
+	if (is.null(unitsAbbreviation) == FALSE) {
+		if (is.character(unitsAbbreviation) == FALSE) {
+			return (print(paste0("Error: unitsAbbreviation must be a string.")))
+		}
+	}
+	if (is.null(good) == FALSE) {
+		if (is.logical(good) == FALSE) {
+			return (print(paste0("Error: good must be a boolean.")))
+		}
+	}
+	if (is.null(questionable) == FALSE) {
+		if (is.logical(questionable) == FALSE) {
+			return (print(paste0("Error: questionable must be a boolean.")))
+		}
+	}
+	if (is.null(substituted) == FALSE) {
+		if (is.logical(substituted) == FALSE) {
+			return (print(paste0("Error: substituted must be a boolean.")))
+		}
+	}
+	if (is.null(annotated) == FALSE) {
+		if (is.logical(annotated) == FALSE) {
+			return (print(paste0("Error: annotated must be a boolean.")))
+		}
+	}
+	if (is.null(value) == FALSE) {
+	}
+	if (is.null(errors) == FALSE) {
+		if (is.vector(errors) == FALSE) {
+			return (print(paste0("Error: errors must be a vector.")))
+		}
+	}
+	if (is.null(webException) == FALSE) {
+		className <- attr(webException, "className")
+		if ((is.null(className)) || (className != "PIWebException")) {
+			return (print(paste0("Error: the class from the parameter webException should be PIWebException.")))
+		}
+	}
+	value <- list(
+	Action = action,
+	Timestamp = timestamp,
+	UnitsAbbreviation = unitsAbbreviation,
+	Good = good,
+	Questionable = questionable,
+	Substituted = substituted,
+	Annotated = annotated,
+	Value = value,
+	Errors = errors,
+	WebException = webException)
+	valueCleaned <- rmNullObs(value)
+	attr(valueCleaned, "className") <- "PIDataPipeEvent"
+	return(valueCleaned)
+}