Mercurial > hg > orthanc-python
annotate Sources/PythonObject.cpp @ 227:9574f06d8588 default tip
todo
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Tue, 24 Sep 2024 08:54:11 +0200 |
parents | 3678a028f1f6 |
children |
rev | line source |
---|---|
219
3678a028f1f6
making the project REUSE-compliant
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
171
diff
changeset
|
1 /** |
3678a028f1f6
making the project REUSE-compliant
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
171
diff
changeset
|
2 * SPDX-FileCopyrightText: 2020-2023 Osimis S.A., 2024-2024 Orthanc Team SRL, 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain |
3678a028f1f6
making the project REUSE-compliant
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
171
diff
changeset
|
3 * SPDX-License-Identifier: AGPL-3.0-or-later |
3678a028f1f6
making the project REUSE-compliant
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
171
diff
changeset
|
4 */ |
3678a028f1f6
making the project REUSE-compliant
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
171
diff
changeset
|
5 |
0 | 6 /** |
7 * Python plugin for Orthanc | |
166
6fada29b6759
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
155
diff
changeset
|
8 * Copyright (C) 2020-2023 Osimis S.A., Belgium |
6fada29b6759
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
155
diff
changeset
|
9 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
155
71d305c29cfa
updated year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
10 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
0 | 11 * |
12 * This program is free software: you can redistribute it and/or | |
13 * modify it under the terms of the GNU Affero General Public License | |
14 * as published by the Free Software Foundation, either version 3 of | |
15 * the License, or (at your option) any later version. | |
16 * | |
17 * This program is distributed in the hope that it will be useful, but | |
18 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
20 * Affero General Public License for more details. | |
21 * | |
22 * You should have received a copy of the GNU Affero General Public License | |
23 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
24 **/ | |
25 | |
26 | |
27 #include "PythonObject.h" | |
28 | |
68
0b3ef425db31
refactoring using ICallbackRegistration::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
56
diff
changeset
|
29 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" |
0 | 30 #include "PythonLock.h" |
31 | |
32 | |
33 PythonObject::PythonObject(PythonLock& lock, | |
34 PyObject *object, | |
35 bool borrowed) : | |
36 lock_(lock), | |
37 object_(object), | |
38 borrowed_(borrowed) | |
39 { | |
40 } | |
41 | |
42 | |
43 PythonObject::~PythonObject() | |
44 { | |
45 if (!borrowed_ && | |
46 object_ != NULL) | |
47 { | |
48 Py_DECREF(object_); | |
49 } | |
50 } | |
51 | |
52 | |
53 PyObject* PythonObject::GetPyObject() const | |
54 { | |
55 if (object_ == NULL) | |
56 { | |
57 // "IsValid()" should have been called | |
58 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
59 } | |
60 else | |
61 { | |
62 return object_; | |
63 } | |
64 } | |
65 | |
66 | |
67 PythonObject* PythonObject::GetAttribute(const std::string& name) | |
68 { | |
69 return new PythonObject(lock_, PyObject_GetAttrString(GetPyObject(), name.c_str())); | |
70 } | |
71 | |
72 | |
51
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
73 bool PythonObject::ToUtf8String(std::string& target, |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
74 PyObject* value) |
0 | 75 { |
51
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
76 if (value == NULL) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
77 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
78 ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
79 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
80 else if (PyUnicode_Check(value)) |
0 | 81 { |
82 PythonObject encoded(lock_, PyUnicode_AsEncodedString(value, "utf-8", "replace")); | |
83 if (encoded.IsValid()) | |
84 { | |
85 target = PyBytes_AS_STRING(encoded.GetPyObject()); | |
86 return true; | |
87 } | |
88 else | |
89 { | |
90 target.clear(); | |
91 return false; | |
92 } | |
93 } | |
94 #if PY_MAJOR_VERSION == 2 | |
95 else if (PyString_Check(value)) | |
96 { | |
97 target = PyString_AS_STRING(value); | |
98 return true; | |
99 } | |
100 #endif | |
101 else | |
102 { | |
103 target.clear(); | |
104 return false; | |
105 } | |
106 } | |
107 | |
108 | |
109 void PythonObject::Format(std::ostream& os) | |
110 { | |
111 std::string s; | |
112 if (object_ == NULL) | |
113 { | |
114 os << "Can't format a NULL Python object" << std::endl; | |
115 } | |
116 else if (ToUtf8String(s)) | |
117 { | |
118 os << s; | |
119 } | |
120 else | |
121 { | |
122 os << "Can't format this Python object" << std::endl; | |
123 } | |
124 } | |
125 | |
126 | |
127 PyObject* PythonObject::Release() | |
128 { | |
129 if (!borrowed_ && | |
130 object_ != NULL) | |
131 { | |
132 PyObject* value = object_; | |
133 object_ = NULL; | |
134 return value; | |
135 } | |
136 else | |
137 { | |
171
c8de83fe7faa
removed deprecation warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
138 ORTHANC_PLUGINS_LOG_ERROR("Cannot release a NULL or borrowed reference"); |
0 | 139 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
140 } | |
141 } | |
142 | |
51
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
143 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
144 void PythonObject::ConvertToJson(Json::Value& target, |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
145 PyObject* source) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
146 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
147 // WARNING: The order *is* important! |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
148 if (source == Py_None) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
149 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
150 target = Json::nullValue; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
151 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
152 else if (PyBool_Check(source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
153 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
154 target = (PyObject_IsTrue(source) ? true : false); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
155 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
156 else if (PyLong_Check(source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
157 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
158 target = static_cast<int32_t>(PyLong_AsLong(source)); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
159 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
160 else if (PyFloat_Check(source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
161 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
162 target = PyFloat_AsDouble(source); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
163 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
164 else if (PyNumber_Check(source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
165 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
166 PythonObject asLong(lock_, PyNumber_Long(source)); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
167 if (PyLong_Check(asLong.GetPyObject())) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
168 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
169 target = static_cast<int32_t>(PyLong_AsLong(asLong.GetPyObject())); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
170 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
171 else |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
172 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
173 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
174 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
175 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
176 else if (PyUnicode_Check(source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
177 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
178 std::string s; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
179 if (ToUtf8String(s, source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
180 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
181 target = s; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
182 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
183 else |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
184 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
185 ORTHANC_PLUGINS_THROW_EXCEPTION(NotImplemented); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
186 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
187 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
188 #if PY_MAJOR_VERSION == 2 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
189 else if (PyString_Check(source)) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
190 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
191 target = PyString_AS_STRING(source); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
192 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
193 #endif |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
194 else if (PySequence_Check(source)) // tuples or lists |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
195 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
196 Py_ssize_t size = PySequence_Size(source); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
197 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
198 if (size < 0) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
199 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
200 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
201 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
202 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
203 target = Json::arrayValue; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
204 for (Py_ssize_t i = 0; i < size; i++) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
205 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
206 Json::Value item; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
207 ConvertToJson(item, PySequence_GetItem(source, i)); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
208 target.append(item); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
209 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
210 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
211 else if (PyMapping_Check(source)) // dictionaries |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
212 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
213 PythonObject items(lock_, PyMapping_Items(source)); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
214 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
215 Py_ssize_t size = PySequence_Size(items.GetPyObject()); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
216 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
217 if (size < 0) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
218 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
219 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
220 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
221 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
222 for (Py_ssize_t i = 0; i < size; i++) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
223 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
224 PyObject* pair = PySequence_GetItem(items.GetPyObject(), i); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
225 |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
226 std::string key; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
227 Json::Value value; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
228 if (pair != NULL && |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
229 ToUtf8String(key, PySequence_GetItem(pair, 0))) |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
230 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
231 ConvertToJson(value, PySequence_GetItem(pair, 1)); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
232 target[key] = value; |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
233 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
234 else |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
235 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
236 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
237 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
238 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
239 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
240 else |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
241 { |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
242 ORTHANC_PLUGINS_THROW_EXCEPTION(NotImplemented); |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
243 } |
3dc37a5af1b1
new method PythonObject::ConvertToJson()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
36
diff
changeset
|
244 } |