diff --git a/en/application-dev/reference/apis/js-apis-application-dataShareExtensionAbility.md b/en/application-dev/reference/apis/js-apis-application-dataShareExtensionAbility.md
index 0a97689f23cdf69527c61dfc8dfba28e6869badf..aa2edefb9e669ac5d20af6b3cb88247485027def 100644
--- a/en/application-dev/reference/apis/js-apis-application-dataShareExtensionAbility.md
+++ b/en/application-dev/reference/apis/js-apis-application-dataShareExtensionAbility.md
@@ -43,7 +43,7 @@ Example:
| Name| Type| Readable| Writable| Description|
| -------- | -------- | -------- | -------- | -------- |
-| context | [ExtensionContext](js-apis-inner-application-extensionContext.md) | Yes| No|Context of the DataShare Extension ability.|
+| context | [ExtensionContext](js-apis-inner-application-extensionContext.md) | Yes| No|Context of the DataShare Extension ability.|
## onCreate
@@ -57,7 +57,7 @@ Called by the server to initialize service logic when the DataShare client conne
| Name| Type| Mandatory| Description|
| ----- | ------ | ------ | ------ |
-| want | [Want](js-apis-application-want.md#want) | Yes | **Want** information, including the ability name and bundle name.|
+| want | [Want](js-apis-application-want.md#want) | Yes | Want information, including the ability name and bundle name.|
| callback | AsyncCallback<void> | Yes| Callback that returns no value.|
**Example**
@@ -78,10 +78,10 @@ export default class DataShareExtAbility extends DataShareExtensionAbility {
name: DB_NAME,
securityLevel: rdb.SecurityLevel.S1
}, function (err, data) {
- console.log('getRdbStore done, data : ${data}');
+ console.info(`getRdbStore done, data : ${data}`);
rdbStore = data;
rdbStore.executeSql(DDL_TBL_CREATE, [], function (err) {
- console.error('executeSql done, error message : ${err}');
+ console.error(`executeSql done, error message : ${err}`);
});
if (callback) {
callback();
@@ -122,11 +122,11 @@ let rdbStore;
export default class DataShareExtAbility extends DataShareExtensionAbility {
insert(uri, valueBucket, callback) {
if (valueBucket === null) {
- console.info('invalid valueBuckets');
+ console.error('invalid valueBuckets');
return;
}
rdbStore.insert(TBL_NAME, valueBucket, function (err, ret) {
- console.info('callback ret: ${ret}');
+ console.info(`callback ret: ${ret}`);
if (callback !== undefined) {
callback(err, ret);
}
@@ -256,7 +256,7 @@ export default class DataShareExtAbility extends DataShareExtensionAbility {
}
rdbStore.query(TBL_NAME, predicates, columns, function (err, resultSet) {
if (resultSet !== undefined) {
- console.info('resultSet.rowCount: ${resultSet.rowCount}');
+ console.info(`resultSet.rowCount: ${resultSet.rowCount}`);
}
if (callback !== undefined) {
callback(err, resultSet);
@@ -297,14 +297,12 @@ let rdbStore;
export default class DataShareExtAbility extends DataShareExtensionAbility {
batchInsert(uri, valueBuckets, callback) {
if (valueBuckets === null || valueBuckets.length === undefined) {
- console.info('invalid valueBuckets');
+ console.error('invalid valueBuckets');
return;
}
- let resultNum = valueBuckets.length;
- valueBuckets.forEach(vb => {
- rdbStore.insert(TBL_NAME, vb, function (err, ret) {
+ rdbStore.batchInsert(TBL_NAME, valueBuckets, function (err, ret) {
if (callback !== undefined) {
- callback(err, resultNum);
+ callback(err, ret);
}
});
});
@@ -333,7 +331,7 @@ Normalizes a URI. This API can be overridden as required.
export default class DataShareExtAbility extends DataShareExtensionAbility {
normalizeUri(uri, callback) {
let err = {'code':0};
- let ret = 'normalize+${uri}';
+ let ret = `normalize: ${uri}`;
callback(err, ret);
}
};
@@ -360,7 +358,7 @@ Denormalizes a URI. This API can be overridden as required.
export default class DataShareExtAbility extends DataShareExtensionAbility {
denormalizeUri(uri, callback) {
let err = {'code':0};
- let ret = 'denormalize+${uri}';
+ let ret = `denormalize ${uri}`;
callback(err, ret);
}
};
diff --git a/en/application-dev/reference/apis/js-apis-data-DataShareResultSet.md b/en/application-dev/reference/apis/js-apis-data-DataShareResultSet.md
index 4cdef60fa628733e5be8cc6df783548b7b5bcd07..020d8c43c94ccb8313a7cde1fbad39048b11395b 100644
--- a/en/application-dev/reference/apis/js-apis-data-DataShareResultSet.md
+++ b/en/application-dev/reference/apis/js-apis-data-DataShareResultSet.md
@@ -27,7 +27,7 @@ let dataShareHelper;
let uri = ("datashare:///com.samples.datasharetest.DataShare");
await dataShare.createDataShareHelper(this.context, uri, (err, data) => {
if (err != undefined) {
- console.info("createDataShareHelper fail, error message : " + err);
+ console.error("createDataShareHelper fail, error message : " + err);
} else {
console.info("createDataShareHelper end, data : " + data);
dataShareHelper = data;
@@ -39,10 +39,10 @@ let da = new dataSharePredicates.DataSharePredicates();
let resultSet;
da.equalTo("name", "ZhangSan");
dataShareHelper.query(uri, da, columns).then((data) => {
- console.log("query end, data : " + data);
+ console.info("query end, data : " + data);
resultSet = data;
}).catch((err) => {
- console.log("query fail, error message : " + err);
+ console.error("query fail, error message : " + err);
});
```
diff --git a/en/application-dev/reference/apis/js-apis-data-dataShare.md b/en/application-dev/reference/apis/js-apis-data-dataShare.md
index 991aa683273c5c1408c0574bffa48c8cd342a96a..8b63922d8401f545c01275f4affecaf960987d50 100644
--- a/en/application-dev/reference/apis/js-apis-data-dataShare.md
+++ b/en/application-dev/reference/apis/js-apis-data-dataShare.md
@@ -17,6 +17,27 @@ The **DataShare** module allows an application to manage its own data and share
import dataShare from '@ohos.data.dataShare'
```
+## URI Naming Rule
+
+The URIs are in the following format:
+
+**Scheme://authority/path**
+- *Scheme*: scheme name, which has a fixed value of **datashare** for the **DataShare** module.
+- *authority*: [userinfo@]host[:port]
+ - *userinfo*: login information, which can be left unspecified.
+ - *host*: server address. It is the target device ID for cross-device access and empty for local device access.
+ - *port*: port number of the server, which can be left unspecified.
+- *path*: **DataShare** identifier and the resource path. The **DataShare** identifier is mandatory, and the resource path is optional.
+
+Example:
+
+- URI without the resource path:
**datashare:///com.samples.datasharetest.DataShare**
+
+- URI with the resource path:
**datashare:///com.samples.datasharetest.DataShare/DB00/TBL00**
+
+**com.samples.datasharetest.DataShare** is the data share identifier, and **DB00/TBL00** is the resource path.
+
+
## dataShare.createDataShareHelper
createDataShareHelper(context: Context, uri: string, callback: AsyncCallback<DataShareHelper>): void